Add assertion about string sizes

Currently this assertion fails
Fix WS macros

It did not play well with if() in that state
Add braces

According to current version of the style guide braces with if() are required
always