More type cleanups