NorthernWind

Remove workarounds for JDK 1.7 and AspectJ 1.6