raise NotImplementedError instead of hanging up on <Data> in _
Minor refactor