Minor cleanup / fix one bad allocation pattern