Switched to using trivial-arguments for the argument list for improved compat and fixing the sb-introspect dependency.