Use modern [[ ]] constructs