remove import statement from generated code (this also implies Instant and Period must be qualified everywhere). some additional minor code quality improvements.