Trim backtracking maps on update in mutable version
Default switch cases to kill clang warnings