[HB] Remove clumsy macros and improve API
drwxr-xr-x - src