Better handling of node parameter in calling conventions