branch drift: more explicit todo's