Clean up the 9625 changes - reduce them to a minimum needed to work
Wait for discussion on that issue before doing more
_get_values now uses _check_values()