Revert "DRY up Mapping::Definition"

This reverts commit 59ca3b58906decade76895827c1c4700aa40b223.
Simplify Definition#model and #mapper