Fix stray 'Optional.of()s' cropping up in rendered output