Requirement to use anchors in IRIs; minor tidy ups.