Stable code for one-step client code generation without silly hacks