no longer need a block helper to wrap each template

This also includes updates to follow the latest intl-messageformat changes (specifically the structure of the formats).