After @jmclaus comment I see, that fixing that will unblock this PR. Good to know.