Compiler hard coding removed.

The hard coding in the compiler generated code is removed.