Update optional to conform better to the standard proposal document.