Create a variant of omit_local_variable_types that permits non-trivial declared types

Create a variant of omit_local_variable_types that permits non-trivial declared types #2443