Minor cleanup
Apply the fog fix to software transform as well. See #2387