Code generation refactoring; added 'null' as a literal.