You're right, that's cleaner.  Done.