Still ironing out some regres'ns re symloc changes.