More small tweaks to rule lising.