Switched back to using assembly with proper scope markings on junit, easymock and storm.