Add support for #callback
hlint cleanup