(Hopefully) final round of changes.