Fixed up some non-Eval-centric functions for Scheme names