Added basic operation support and improved expression evaluation in some
cases.