Refactoring
Generalized code
Improved consistency

no more mentions "variable declaration", just "declaration"
Refined entities, closing issue #2
Fix up test cases/testers