Rewrite declaration var, let, const indenting

Fixes  #256, #430
Additional declaration tweaks based on a few more test inputs