Better conditionals

Reid As promised: could you look at Trac #13397, re tagToEnum#. In particular, why is n-body running slower?? The change is basically a good one: removes a nasty special case in the code generator and de-clutters the code generally. So I'm keen to keep it. Not important for 8.2 though. Thanks Simon