r4418: fix compiler warning and remove unused typedef