Nicer file path extraction in requires
Fix failing tests due to moving equal? into the stdlib