Bool token formatting

I hit an issue today where we were using tokens in smarty. We already have this format in several message templates - e.g

{if '{contact.current_employer}'} ({contact.current_employer}){/if}

The single quotes are necessary as {if } {/if} will fail - so it renders to {if ''} {/if}

However, the problem we hit is if the employer is O'Malley Construction' which renders as {if 'O'Malley Construction'} {/if}

I think the solution is to add a bool modifier & allow any token to be passed through it - it would also simplify the smarty a little - ie

{if {contact.current_employer|bool}} ({contact.current_employer}){/if}