Move helpers into core ns