[minor] Coverity defects 16833, 16834 addressed (COPY_INSTEAD_OF_MOVE). Also tidied headers and moved an enum out of global namespace into class.