More idiomatic code

latest commit 36df2e5114
@rscholer authored