Fix handling of eval printing, working toward tests passing