Minor cleanup question 86, wip question 89.