Various fixes, simplified the evaluator for common arg-forcing cases