A cleanup and a stupid bug fix (module-segment-bases were getting corrupted because...