Some more minor mods to SimpleEntity patterns