Cool.  I think this is ready to be merged after this change.