opt: subst improved
opt: map improved (includes substitute etc.)