Allow changes in 5ed15e24f1dec15d83025c66ec9177ca3eb6272f to read a bit more idiomatically