Merge "Clean up BeginCommand."