room for improvement in this part of the definition

Well, maybe, but is that the place for it? Tangent should be given its own definition. Look for it there.