Support, and fix up, interface lists for Optional