Clean up struct: and disallow unsupported options

Related to PR 13562