Correctly pass op and node to non-proposal types