Revert "Use typedefs to avoid triply-nested function templates"

This reverts commit 45b0bc4b.

This revert is being done because the compilers on Travis don't
understand the C++11 template/using syntax.