Actually fix pedantic build bustage.