I've been traveling for the last several days (still am, in fact; writing this on a train through New England) but will commit "the first way" when I return home next week, unless someone else wants to grab the diff and do it for me.