DOC: Address @larsman's comments