Oh... if so, that would be even cleaner.  I'll push some updates this evening.