Remove excessive cleverness.