Cleaning up generated code
Making more names in generated code fullyqualified
Merge pull request #234 from scala/tidying

Making more names in generated code fully-qualified
Merge branch '0.9.x' into 0.10.x