As above, it felt better to be explicit about what's happening here, instead of letting this bubble up.