refactor helpers to be extension methods

Some minor refactoring opportunities which I spotted whilst reviewing #187

If I've gone too far anywhere just say so, I have a tendency to 'over-inline' sometimes.