Patch after annotations

Missing patch isn't fatal, annotations could have still made
modifications.

New order allows annotations to clear out code holes before the
actual patch.