Edits to generated code in Rectangle (renamed constants & removed duplicates, more nowait optimizations)