Leftover changes from paper submission and before.