More tweaks to assumptions.