Clean up argument names in specs, simplify return types