Add a a few arg type declarations and "not None" assertions