Use generic trait parameters to minimize associated types

Use generic trait parameters to minimize associated types #1209