Tighten up some conditionals