Some cleanup of the previous assumptions.