Clean up last merge a bit.