Fix two swapped definitions.  Note it is directly committed to this branch
because it fixes r250496, i.e., MFC of r247369 to stable/9.