Remove all the special cased functions in favor of moar args.
More of the same.
Fix indentation issue.