Change canonicalise_acl() to not take an fsp.