post-merge cleanup (mergetool sometimes mangles stuff a little>, retaining Currency for now.