Move GetterSetters, more revisions to API.