Fix a lot of breakage caused by removing/hiding accessors