Avoid parameter assignment
Remove accidental comment
Remove the need for synthetic accessor from inner class
Reduce visibility of methods that take or return non-public classes.

Methods that take or return non-public classes can be public, but it
doesn't really make any sense.