Restructure qualifier handling so we can have more rules per-field -