Improved type signatures. Next up, simplify the type aliases.
Removed needless type aliases.