Also cleans up a couple of template definitions by using the
appropriate "using" type name.

BUG= https://code.google.com/p/nativeclient/issues/detail?id=4334
R=stichnot@chromium.org

Review URL: https://codereview.chromium.org/1430713003 .