Finish refactoring / cleanup / test modifications to prepare for string.format() alternative to suffix and regex