complete emit-form pass, closes #23