Improve JDK serialization handling of inner-non-static class properties