Minor cleanups in type annotations