More work on #67, moved post-typer post-prepare