Various improvements to FITS utility classes.
Fixing merge conflict.