More syntactic sugar

- On the road to Scala-ifying stuff yet-again!