More notes to self, in the form of Haddock comments.