Re-introduce >, <, >=, <= as functions when needed, clean up specs