Fixed #608 calculating the type on the definition not on the expression
Fixed makeNode implementation to support keyword parameters