Deal with pre- and post- procedure creation better.