Fix yard doc error for Helpers

There was an error in helpers.rb due to the fact I copied a macro contents
but did not remove the usage of $0.

Also removed a couple of other little extraneous items, that I noticed.

Signed-off-by: Ken Barber <ken@bob.sh>
Merge branch 'fix_yard_error'

* fix_yard_error:
  Fix yard doc error for Helpers