Some cleanup
Merge branch '2.10' of https://github.com/xmanu/scala-virtual-classes-annotation-macros into 2.10