No, we didn't. Like I said, we created custom user controls instead, so we don't need to use the content before and after fields for conditional logic.
See also: https://devnet.kentico.com/questions/if-macros-security-issue-in-widgets-(portal-engine)