Use underscore now that set_defaults is out of the toolkit