Cleanup usage of boost optional