Improvements to handling of selector arguments.