Codegen tweaks - store seems to be a reserved word!?