Fix up iteration of properties a bit
acl: junk a crapload of useless code