Partial rewrite of CallNode