Add mapMaybeWithKeyTM to the TrieMap class
Update the output for test 225
Avoid re-applying the substitution to goals
Merge branch 'master' into wip/cs
Implement mapMaybeWithKeyTM for Expr/Prop maps