Issue #2787441 by Bambell: Token type generated for field types without properties, results in invalid requirements output