Flip this one around for readability:

```scala
Option(gapFill).map(GapFill.withName(_)).getOrElse(GapFill.NONE)
```