Removed obsolete test
Refactored parse-vars into its own function
as prep for finding loop targets.