Cleaned up expression parsing code.