Make ACL be what SIP is going to need (bug #2358, just first part)