Simplify java.lang.Object mappings