Wrapping up some changes before hunting down a regression...