A little cleaning up after that refactor for #56.