Updated more :sym => and cleanup empty helpers