Make input level reporting work again, without performance penalty.