Reduce Scala feature abuse / clean up 2.10 warnings