Add whitespace between variable declarations and other code

This commit adds a blank line in both the C and Bash code between the
variable declarations and the code using those declarations as a style
fix.  It also adds a few extra Bash variable declarations which were
originally forgotten.
Remove extra commented-out code
Fix reprinting prompt in NEW-* completion functions

Previously the NEW-* functions attempted to directly print out $PS1
which does not always work as many escape characters that can be present
in $PS1 are not handled by printf.  This commit changes it tuo use a
dummy function which currently invokes "bash -i" to get a copy of the
prompt.