Switched `typedef`s to `using`s as per standards