Changes per David Mosher: allow space and tab around '<' and '>' on