Cleanup from yesterday, now with a bit more understanding.