Code and comments revisited.
Support for new protected static field.