Clean up XS compile warnings: t+