Leveraging more-idiomatic Scala