DRY up Mapping::Definition
Adjust flay thresholds