PERF: eliminate wrappers where I can