What about just using the first-order/higher-order distinction here?