Fix several "unused" warnings introduced in #1417