Dicom kwargs refactor

Rethinking the dicom keyword args a little bit.

Sorry Satra, I forgot about your changes and then found myself rewriting them, with some extra tests etc.