If we're gonna use Optional, let's not hack around it.  Please do this TODO sooner rather than later.