I'll add the vct names, and search around for stuff like pi -- thanks for pointing them out. I don't know what the "right thing" is in general.