Fix some issues near recent chomp changes.