Consistency in error messages
Actually making the parameter mapping this time

ALL HAIL THE **FOREACH LORD**