Remove boilerplate duplication

Does exactly what it says on the tin.  No doc comments yet, those to come later on an new branch + PR