Tidy field names and add TODO regarding independent weighing of reps
from same params.