ComponentOption -> CreateOption, other opt fixes.