Get rid of eval in user calls