Following from the comment at line 284, I think the getOrElse can be eliminated.