first is a correctness thing, and the later is an optzn thing.  This also
is needed to support a future change.

llvm-svn: 22720