Wow, this is a noisy diff.  I just moved this function to the bottom of the file...