Changed representation of comparison ops to be binary operators. Cleaned up a bit too.