Remove const vector macro indirection that is useless and obfuscating