I had a huge mental block when writing this code, so thanks for this.  I agree this is much cleaner.