Random modifications that slightly improve the chances of this not blowing up.

Walter will fix it for real.