A few more fixes and clean-ups for the removal of setting $[

A few more fixes and clean-ups for the removal of setting $[ #1376