Functionally equivalent updates to package private classes to improve the code and make it easier to understand.