Deprecate a few more syntaxes. Add sub?-q test macro