remove more cruft and set the immutable bit for immutable maps