Hi all, below are a couple cleanup patches to prepare for the next version of the nvme multipath code.