shuffle code around
uniquify bootstrap index variable names

useful because dynamic scoping can make naming conflicts  common
add test of multi-line body on a single line