Improve logging and remove an edge case.