libhb: cleanup.
CLI: cleanup.
MacGui: cleanup.