Ah yes, I noticed Ian moving some of this around.  I will definitely sync up so we don't miss merges like this.