Why move the location of these functions within the file?  Seems kind of like a spurious change unless I am missing something.