First attempt to fix #44 (single quotes for string literals in helpers)