Also get rid of ':optional'.