Uncomment some assertions that were temporarily commented out during refactoring.