Tweaks to parse rules, convert more handlers to use them