Optionally, I can move the declarations to the top which will eliminate these large diffs here. Thoughts?