Yay! I'm glad you approve, this is much easier to maintain and makes diffs much more readable.