Minor de-smellification (though the stench is still overwhelming)
More cleanups to the ACL api