removed the dependency on SimpleNameDeclaration, but it still isn't good.