Fix up edit_component so that it doesn't take an unnecessary step argument