Refactorings

The thunk here is pretty useless... No second argument would be better