Support NUCCORE-1197, genericise value generators