Minor improvements for call statement template