Merge "long modifier was on the wrong argument."