A bit more rearranging before adding Matrix Market input support.