Add more interfaces to RMap type, passing ztellman's collection-check