Try binding all argument forms directly through

Try binding all argument forms directly through #1565