Let's go with my approach. One less conditional, and more future proof.