It still has some big problems, but at least it more or less understands block arguments now. Closes #1925