Refactoring clients to be slightly neater.