Presumably this bracketing will all get fixed up before you merge?  (Likewise on the catch below.)