Seems like I've seen this long statement a lot in recent commits.  We've talked about simplifying it, but haven't?