I _think_ I was thinking short-circut the `&&` at the time... I think :)

In reality, along with your comment below about the tri-state ``shelltype``, I agree this is a spot that needs some TLC before I request a final check and sign-off.