Finished the conversion to dynamic vars.
Minor clean-up.