Catch more places where the callback should just return on parse/check