This pull request is small and doesn't include many changes to any existing functionality. In the interest of removing blockers ASAP, I will merge.