* Minor cleanups to avoid copying of symbols and stuff like that.