Simplify function signatures.
Remove clutter.
Rewrite for clarity.