It'd be nicer to just use the several commits separately if that's OK and they apply.