diff --git a/src/otpbp_pt.erl b/src/otpbp_pt.erl
index 717e4d00..2e4827e9 100644
--- a/src/otpbp_pt.erl
+++ b/src/otpbp_pt.erl
@@ -28,15 +28,14 @@
                               {{term_to_iovec, [1, 2]}, otpbp_erlang},
                               {{application, get_supervisor, 1}, otpbp_application},
                               {{application, set_env, [1, 2]}, otpbp_application},
-                              {{argparse, format_error, [1, 2]}, otpbp_argparse},
-                              {{argparse, help, [1, 2]}, otpbp_argparse},
+                              {{argparse, [format_error, help], [1, 2]}, otpbp_argparse},
                               {{argparse, parse, [2, 3]}, otpbp_argparse},
                               {{argparse, run, 3}, otpbp_argparse},
                               {{argparse, validate, [1, 2]}, otpbp_argparse},
                               {{beam_lib, significant_chunks, 0}, otpbp_beam_lib},
                               {{beam_lib, [strip, strip_files, strip_release], 2}, otpbp_beam_lib},
-                              {{binary, [decode_hex, encode_hex], 1}, otpbp_binary},
-                              {{binary, encode_hex, 2}, otpbp_binary},
+                              {{binary, decode_hex, 1}, otpbp_binary},
+                              {{binary, encode_hex, [1, 2]}, otpbp_binary},
                               {{c, c, 3}, otpbp_c},
                               {{c, erlangrc, 1}, otpbp_c},
                               {{c, [h, hcb, ht], [1, 2, 3]}, otpbp_c},
@@ -143,10 +142,8 @@
                               {{gen_tcp, connect, 2}, otpbp_gen_tcp},
                               {{gen_udp, connect, 2}, otpbp_gen_udp},
                               {{gen_udp, send, [3, 5]}, otpbp_gen_udp},
-                              {{inet,
-                                [ensure_sockaddr, gen_tcp_module, gen_udp_module, info,
-                                 ipv4_mapped_ipv6_address, is_ip_address, is_ipv4_address, is_ipv6_address],
-                                1},
+                              {{inet, [ensure_sockaddr, gen_tcp_module, gen_udp_module, info], 1}, otpbp_inet},
+                              {{inet, [ipv4_mapped_ipv6_address, is_ip_address, is_ipv4_address, is_ipv6_address], 1},
                                otpbp_inet},
                               {{io_lib, format, 3}, otpbp_io_lib},
                               {{io_lib, fwrite, 3}, {otpbp_io_lib, format}},
@@ -218,11 +215,9 @@
                               {{re, version, 0}, otpbp_re},
                               {{scheduler, [get_sample, get_sample_all, sample, sample_all], 0}, otpbp_scheduler},
                               {{scheduler, utilization, [1, 2]}, otpbp_scheduler},
+                              {{sets, [filtermap, from_list, is_equal, map], 2}, otpbp_sets},
+                              {{sets, [is_empty, new], 1}, otpbp_sets},
                               {{sets, foreach, 2}, otpbp_sets},
-                              {{sets, [filtermap, is_equal, map], 2}, otpbp_sets},
-                              {{sets, from_list, 2}, otpbp_sets},
-                              {{sets, is_empty, 1}, otpbp_sets},
-                              {{sets, new, 1}, otpbp_sets},
                               {{shell_docs, [render, render_callback], 5}, otpbp_shell_docs},
                               {{shell_docs, supported_tags, 0}, otpbp_shell_docs},
                               {{snmpa, old_info_format, 1}, otpbp_snmpa},
@@ -255,9 +250,9 @@
                                 1},
                                otpbp_unicode},
                               {{unicode_util, [spec_version, whitespace], 0}, otpbp_unicode_util},
-                              {{unicode_util, [casefold, cp, gc, get_case, is_whitespace, lookup, lowercase, nfc, nfd,
-                                               nfkc, nfkd, titlecase,uppercase], 1},
-                               otpbp_unicode_util},
+                              {{unicode_util, [casefold, lowercase, titlecase, uppercase], 1}, otpbp_unicode_util},
+                              {{unicode_util, [cp, gc, get_case, is_whitespace, lookup], 1}, otpbp_unicode_util},
+                              {{unicode_util, [nfc, nfd, nfkc, nfkd], 1}, otpbp_unicode_util},
                               {{uri_string, allowed_characters, 0}, otpbp_uri_string},
                               {{uri_string, [is_host, is_path], 1}, otpbp_uri_string},
                               {{uri_string, [dissect_query, parse, percent_decode, recompose, unquote], 1},
@@ -272,8 +267,7 @@
                               {{zlib, inflateGetDictionary, 1}, otpbp_zlib},
                               {{zlib, inflateChunk, [1, 2]}, otpbp_zlib},
                               {{zlib, getBufSize, 1}, otpbp_zlib},
-                              {{zlib, safeInflate, 2}, otpbp_zlib},
-                              {{zlib, setBufSize, 2}, otpbp_zlib},
+                              {{zlib, [safeInflate, setBufSize], 2}, otpbp_zlib},
                               {{zlib, [compress, gzip, zip], 2}, otpbp_zlib}]).
 -define(TRANSFORM_BEHAVIOURS, []).