Rearrange prep stmts; fix #22