Simplify FluentMessage class

Improve label generation
Fix misplaced use of 'one' for value(s).