general clean-up, removed superfluous .findRule (locate only the first rule in a matched set, relatively useless now that collections is the default use case)