Don't need custom type parameters for now
Fix single-argument parsing