Wrap those super-long func definitions

May still look for a way to make the arg list shorter.