I'd rather leave out these, as they (IMO) have no direct relation to the issue you solve (and will be superseded by the refactoring for oc-nodes anyway).