Tidy up slightly.  Move the new code down to where the other GSParams code is in base.py.
(#562)