Added int-casting where necessary in expresison parsing.