Fixed a majorly stupid bug in regex matching.

Inverted flow of control for delta tests, making it easy to try out
multiple replacments at the same position in the file.

Some random refactoring.