Move more bits into yml.