Cleaned up previous merge a bit.