Switched to ScalaUtils type-safe ===