Fix handling of @call, locals and args.