Slight improvements to Z-code generation