Merge "Better support for argument pages."