Mock generator improvements.