Agreed 100%.  Wanted to keep this commit from becoming _too_ big though (it's already too big!), so postponed that for a separate commit.