java 7 specifics removed, demovisitor moved to test sources