Make completion work a little more again and some reindenting.