Fix bad acl regex for subdomains
Simplify some of henry's WACAuthZ code