Added function calls and made parseExpression a bit less ugly.