Some versions of gcc don't like typenames in these places.

Should fix the bots.