Clean up <*> a bit

Move type definitions for `<*>` near where the types are used.

Rename meaningless variables to be a little more meaningful.