Fix for ParameterizedMessages with multiple params
Fix for last param of ParameterizedMessages being an Error
Some code simplifications