Simplifications

Following on from the earlier change to getRestrictions.