added if and call expressions, fixed error in building ConstListNode