Nice.  This makes things substantially cleaner.