Refactor code to fix "too many arguments" issues

[jamesyoungman]

Fix Clippy warnings about functions having too many arguments and remove any #[allow(clippy::too_many_arguments)] we have in the code.