Needed to alter some access modifiers. Shouldn't make a difference, as
they are still package protected.