Hook name cleanup

Cleanup the hook names before returning them. Removes quote marks,
converts concatenated hooks into {$variable} style hooks. Not perfect,
just works for most current cases.