Some minor cleanups related to typeclass lookup calls.