This is a start, but there're still > 700 of them!
They were originally commented out because the expression parsing utils weren't ready (now they are).