Revert "Uses using instead of typedef."

This reverts commit 9ba1aa5f2fe03be203d14337a8e5f902c360c1b9.