B49: item generation rewrite continues