Better origin debugging strategy
Small cleanup