Minor changes on partial evaluation.