Replace form macro with normal helper method.

Was causing errors when creating optimized build.