This is a pure code movement patch that does $subject in order
to make the following patch easier to read and review.

No functional change.
Signed-off-by: NAlex Chiang <achiang@hp.com>
Signed-off-by: NLen Brown <len.brown@intel.com>