Add a missing return.
Comment out an unused typedef.