Cleaned up safeLetSubst.