Repeated an analogous refactoring (doing to Dollar what we just did to Franc) in one big step
Pushed up the identical constructors