Simplify the previous commit's check a little bit.