More idiomatic code

latest commit 611526cea8
@rscholer authored