Remove unnecessary null checks
Fix handling of rule stop states in full context mode
Simplify similar code paths