Refactor fragile msg macro W and W2 to not burry return control flow.