Handle types of Num
Fix bug in expression parsing