Comment 15 for bug 2012669

Blake, that branch looks like it contains a series of partial/conflicted commits and cleanups, back and forth. Will you please squash those down to a minimal number of functionally-focused commits (/maybe/ 2, probably 1 is fine) for code review?

Sorry, but it's really hard to follow what's happening on that branch.