Simplify the special change/submit event removal logic, per Scott's suggestion in...