Tweaks to Skins / Option Types.