Fix error cases to support the previous argument rule change.