A bit of a cleanup. Also, try to gracefully handle the case when no
secure env variables are set.