[trunk] Further stubbing out