Simplify more function signatures