More in line with other Heroku builds.
Prefer short-circuiting guards to ifs.