[CIFS] clean up some hard to read ifdefs