diff --git a/conf/default.conf.php b/conf/default.conf.php
index 8895942921..f8c9e3e427 100644
--- a/conf/default.conf.php
+++ b/conf/default.conf.php
@@ -1,1093 +1,1093 @@
 <?php
 
 // IMPORTANT: DO NOT EDIT THIS FILE.
 // This file is no longer read by default, and your efforts will have no effect.
 // Follow the instructions in the documentation to configure Phabricator.
 
 return array(
 
   // The root URI which Phabricator is installed on.
   // Example: "http://phabricator.example.com/"
   'phabricator.base-uri'        => null,
 
   // If you have multiple environments, provide the production environment URI
   // here so that emails, etc., generated in development/sandbox environments
   // contain the right links.
   'phabricator.production-uri'  => null,
 
 // -- IMPORTANT! Security! -------------------------------------------------- //
 
   // IMPORTANT: By default, Phabricator serves files from the same domain the
   // application lives on. This is convenient but not secure: it creates a large
   // class of vulnerabilities which can not be generally mitigated.
   //
   // To avoid this, you should configure a second domain in the same way you
   // have the primary domain configured (e.g., point it at the same machine and
   // set up the same vhost rules) and provide it here. For instance, if your
   // primary install is on "http://www.phabricator-example.com/", you could
   // configure "http://www.phabricator-files.com/" and specify the entire
   // domain (with protocol) here. This will enforce that files are
   // served only from the alternate domain. Ideally, you should use a
   // completely separate domain name rather than just a different subdomain.
   //
   // It is STRONGLY RECOMMENDED that you configure this. Your install is NOT
   // SECURE unless you do so.
   'security.alternate-file-domain'  => null,
 
   // Default key for HMAC digests where the key is not important (i.e., the
   // hash itself is secret). You can change this if you want (to any other
   // string), but doing so will break existing sessions and CSRF tokens.
   'security.hmac-key' => '[D\t~Y7eNmnQGJ;rnH6aF;m2!vJ8@v8C=Cs:aQS\.Qw',
 
   // If the web server responds to both HTTP and HTTPS requests but you want
   // users to connect with only HTTPS, you can set this to true to make
   // Phabricator redirect HTTP requests to HTTPS.
   //
   // Normally, you should just configure your server not to accept HTTP traffic,
   // but this setting may be useful if you originally used HTTP and have now
   // switched to HTTPS but don't want to break old links, or if your webserver
   // sits behind a load balancer which terminates HTTPS connections and you
   // can not reasonably configure more granular behavior there.
   //
   // NOTE: Phabricator determines if a request is HTTPS or not by examining the
   // PHP $_SERVER['HTTPS'] variable. If you run Apache/mod_php this will
   // probably be set correctly for you automatically, but if you run Phabricator
   // as CGI/FCGI (e.g., through nginx or lighttpd), you need to configure your
   // web server so that it passes the value correctly based on the connection
   // type. Alternatively, you can add a PHP snippet to the top of this
   // configuration file to directly set $_SERVER['HTTPS'] to the correct value.
   'security.require-https' => false,
 
   // Is Phabricator permitted to make outbound HTTP requests?
   'security.allow-outbound-http' => true,
 
 
 // -- Internationalization -------------------------------------------------- //
 
   // This allows customizing texts used in Phabricator. The class must extend
   // PhabricatorTranslation.
   'translation.provider' => 'PhabricatorEnglishTranslation',
 
   // You can use 'translation.override' if you don't want to create a full
   // translation to give users an option for switching to it and you just want
   // to override some strings in the default translation.
   'translation.override' => array(),
 
 
 // -- Access Policies ------------------------------------------------------- //
 
   // Phabricator allows you to set the visibility of objects (like repositories
   // and source code) to "Public", which means anyone on the internet can see
   // them, even without being logged in. This is great for open source, but
   // some installs may never want to make anything public, so this policy is
   // disabled by default. You can enable it here, which will let you set the
   // policy for objects to "Public". With this option disabled, the most open
   // policy is "All Users", which means users must be logged in to view things.
   'policy.allow-public'         => false,
 
 
 // -- Logging --------------------------------------------------------------- //
 
   // To enable the Phabricator access log, specify a path here. The Phabricator
   // access log can provide more detailed information about Phabricator access
   // than normal HTTP access logs (for instance, it can show logged-in users,
   // controllers, and other application data). If not set, no log will be
   // written.
   //
   // Make sure the PHP process can write to the log!
   'log.access.path'             => null,
 
   // Format for the access log. If not set, the default format will be used:
   //
   //  "[%D]\t%h\t%u\t%M\t%C\t%m\t%U\t%c\t%T"
   //
   // Available variables are:
   //
   //  - %c The HTTP response code.
   //  - %C The controller which handled the request.
   //  - %D The request date.
   //  - %e Epoch timestamp.
   //  - %h The webserver's host name.
   //  - %p The PID of the server process.
   //  - %R The HTTP referrer.
   //  - %r The remote IP.
   //  - %T The request duration, in microseconds.
   //  - %U The request path.
   //  - %u The logged-in username, if one is logged in.
   //  - %P The logged-in user PHID, if one is logged in.
   //  - %M The HTTP method.
   //  - %m For conduit, the Conduit method which was invoked.
   //
   // If a variable isn't available (for example, %m appears in the file format
   // but the request is not a Conduit request), it will be rendered as "-".
   //
   // Note that the default format is subject to change in the future, so if you
   // rely on the log's format, specify it explicitly.
   'log.access.format'           => null,
 
 
 // -- DarkConsole ----------------------------------------------------------- //
 
   // DarkConsole is a administrative debugging/profiling tool built into
   // Phabricator. You can leave it disabled unless you're developing against
   // Phabricator.
 
   // Determines whether or not DarkConsole is available. DarkConsole exposes
   // some data like queries and stack traces, so you should be careful about
   // turning it on in production (although users can not normally see it, even
   // if the deployment configuration enables it).
   'darkconsole.enabled'         => false,
 
   // Always enable DarkConsole, even for logged out users. This potentially
   // exposes sensitive information to users, so make sure untrusted users can
   // not access an install running in this mode. You should definitely leave
   // this off in production. It is only really useful for using DarkConsole
   // utilities to debug or profile logged-out pages. You must set
   // 'darkconsole.enabled' to use this option.
   'darkconsole.always-on'       => false,
 
   // Map of additional configuration values to lock.
   'config.lock' => array(),
 
   // Map of additional configuration values to hide.
   'config.hide' => array(),
 
   // Map of additional configuration values to mask.
   'config.mask' => array(),
 
   // Ignore setup warnings of the following issues.
   'config.ignore-issues' => array(),
 
 // --  MySQL  --------------------------------------------------------------- //
 
   // Class providing database configuration. It must implement
   // DatabaseConfigurationProvider.
   'mysql.configuration-provider' => 'DefaultDatabaseConfigurationProvider',
 
   // The username to use when connecting to MySQL.
   'mysql.user' => 'root',
 
   // The password to use when connecting to MySQL.
   'mysql.pass' => '',
 
   // The MySQL server to connect to.
   'mysql.host' => 'localhost',
 
   // If you want to connect to a different port than the default (which is 3306)
   'mysql.port' => null,
 
   // Phabricator supports PHP extensions MySQL and MySQLi. It is possible to
   // implement also other access mechanism (e.g. PDO_MySQL). The class must
   // extend AphrontMySQLDatabaseConnectionBase.
   'mysql.implementation' => (extension_loaded('mysqli')
     ? 'AphrontMySQLiDatabaseConnection'
     : 'AphrontMySQLDatabaseConnection'),
 
 
 // -- Notifications --------------------------------------------------------- //
 
   // Set this to true to enable real-time notifications. You must also run a
   // notification server for this to work. Consult the documentation in
   // "Notifications User Guide: Setup and Configuration" for instructions.
   'notification.enabled'      => false,
 
   // Client port for the realtime server to listen on, and for realtime clients
   // to connect to. Use "localhost" if you are running the notification server
   // on the same host as the web server.
   'notification.client-uri'   => 'http://localhost:22280/',
 
   // URI and port for the notification root server.
   'notification.server-uri'   => 'http://localhost:22281/',
 
   // The server must be started as root so it can bind to privileged ports, but
   // if you specify a user here it will drop permissions after binding.
   'notification.user'         => null,
 
   // Location where the server should log to.
   'notification.log'          => '/var/log/aphlict.log',
 
   // PID file to use.
   'notification.pidfile'      => '/var/run/aphlict.pid',
 
   // Enable this option to get additional debug output in the browser.
   'notification.debug'        => false,
 
 
 // -- Email ----------------------------------------------------------------- //
 
   // Some Phabricator tools send email notifications, e.g. when Differential
   // revisions are updated or Maniphest tasks are changed. These options allow
   // you to configure how email is delivered.
 
   // You can test your mail setup by going to "MetaMTA" in the web interface,
   // clicking "Send New Message", and then composing a message.
 
   // Default address to send mail "From".
   'metamta.default-address'     => 'noreply@example.com',
 
   // Domain used to generate Message-IDs.
   'metamta.domain'              => 'example.com',
 
   // When a message is sent to multiple recipients (for example, several
   // reviewers on a code review), Phabricator can either deliver one email to
   // everyone (e.g., "To: alincoln, usgrant, htaft") or separate emails to each
   // user (e.g., "To: alincoln", "To: usgrant", "To: htaft"). The major
   // advantages and disadvantages of each approach are:
   //
   //   - One mail to everyone:
   //     - Recipients can see To/Cc at a glance.
   //     - If you use mailing lists, you won't get duplicate mail if you're
   //       a normal recipient and also Cc'd on a mailing list.
   //     - Getting threading to work properly is harder, and probably requires
   //       making mail less useful by turning off options.
   //     - Sometimes people will "Reply All" and everyone will get two mails,
   //       one from the user and one from Phabricator turning their mail into
   //       a comment.
   //     - Not supported with a private reply-to address.
   //     - Mails are sent in the server default translation.
   //   - One mail to each user:
   //     - Recipients need to look in the mail body to see To/Cc.
   //     - If you use mailing lists, recipients may sometimes get duplicate
   //       mail.
   //     - Getting threading to work properly is easier, and threading settings
   //       can be customzied by each user.
   //     - "Reply All" no longer spams all other users.
   //     - Required if private reply-to addresses are configured.
   //     - Mails are sent in the language of user preference.
   //
   // In the code, splitting one outbound email into one-per-recipient is
   // sometimes referred to as "multiplexing".
   'metamta.one-mail-per-recipient'  => true,
 
   // When sending a message that has no To recipient (i.e. all recipients
   // are CC'd, for example when multiplexing mail), set the To field to the
   // following value. If no value is set, messages with no To will have
   // their CCs upgraded to To.
   'metamta.placeholder-to-recipient' => null,
 
   // When a user takes an action which generates an email notification (like
   // commenting on a Differential revision), Phabricator can either send that
   // mail "From" the user's email address (like "alincoln@logcabin.com") or
   // "From" the 'metamta.default-address' address. The user experience is
   // generally better if Phabricator uses the user's real address as the "From"
   // since the messages are easier to organize when they appear in mail clients,
   // but this will only work if the server is authorized to send email on behalf
   // of the "From" domain. Practically, this means:
   //    - If you are doing an install for Example Corp and all the users will
   //      have corporate @corp.example.com addresses and any hosts Phabricator
   //      is running on are authorized to send email from corp.example.com,
   //      you can enable this to make the user experience a little better.
   //    - If you are doing an install for an open source project and your
   //      users will be registering via Facebook and using personal email
   //      addresses, you MUST NOT enable this or virtually all of your outgoing
   //      email will vanish into SFP blackholes.
   //    - If your install is anything else, you're much safer leaving this
   //      off since the risk in turning it on is that your outgoing mail will
   //      mostly never arrive.
   'metamta.can-send-as-user'    => false,
 
   // Limit the maximum size of the body of an email generated for a diff
   // (in bytes).
   'metamta.email-body-limit'    => 524288,
 
   // Adapter class to use to transmit mail to the MTA. The default uses
   // PHPMailerLite, which will invoke "sendmail". This is appropriate
   // if sendmail actually works on your host, but if you haven't configured mail
   // it may not be so great. A number of other mailers are available (e.g., SES,
   // SendGrid, SMTP, custom mailers), consult "Configuring Outbound Email" in
   // the documentation for details.
   'metamta.mail-adapter'        =>
     'PhabricatorMailImplementationPHPMailerLiteAdapter',
 
   // When email is sent, what format should Phabricator use for user's
   // email addresses? Valid values are:
   //  - 'short' - 'gwashington <gwashington@example.com>'
   //  - 'real'  - 'George Washington <gwashington@example.com>'
   //  - 'full' - 'gwashington (George Washington) <gwashington@example.com>'
   // The default is 'full'.
   'metamta.user-address-format' => 'full',
 
   // If you're using PHPMailer to send email, provide the mailer and options
   // here. PHPMailer is much more enormous than PHPMailerLite, and provides more
   // mailers and greater enormity. You need it when you want to use SMTP
   // instead of sendmail as the mailer.
   'phpmailer.mailer'            =>  'smtp',
   'phpmailer.smtp-host'         =>  '',
   'phpmailer.smtp-port'         =>  25,
 
   // When using PHPMailer with SMTP, you can set this to one of "tls" or "ssl"
   // to use TLS or SSL. Leave it blank for vanilla SMTP. If you're sending
   // via Gmail, set it to "ssl".
   'phpmailer.smtp-protocol'     => '',
 
   // Set following if your smtp server requires authentication.
   'phpmailer.smtp-user'         =>  null,
   'phpmailer.smtp-password'     =>  null,
 
   // If you're using Amazon SES to send email, provide your AWS access key
   // and AWS secret key here. To set up Amazon SES with Phabricator, you need
   // to:
   //  - Make sure 'metamta.mail-adapter' is set to:
   //    "PhabricatorMailImplementationAmazonSESAdapter"
   //  - Make sure 'metamta.can-send-as-user' is false.
   //  - Make sure 'metamta.default-address' is configured to something sensible.
   //  - Make sure 'metamta.default-address' is a validated SES "From" address.
   'amazon-ses.access-key'       =>  null,
   'amazon-ses.secret-key'       =>  null,
 
   // If you're using Sendgrid to send email, provide your access credentials
   // here. This will use the REST API. You can also use Sendgrid as a normal
   // SMTP service.
   'sendgrid.api-user'           => null,
   'sendgrid.api-key'            => null,
 
   // You can configure a reply handler domain so that email sent from Maniphest
   // will have a special "Reply To" address like "T123+82+af19f@example.com"
   // that allows recipients to reply by email and interact with tasks. For
   // instructions on configurating reply handlers, see the article
   // "Configuring Inbound Email" in the Phabricator documentation. By default,
   // this is set to 'null' and Phabricator will use a generic 'noreply@' address
   // or the address of the acting user instead of a special reply handler
   // address (see 'metamta.default-address'). If you set a domain here,
   // Phabricator will begin generating private reply handler addresses. See
   // also 'metamta.maniphest.reply-handler' to further configure behavior.
   // This key should be set to the domain part after the @, like "example.com".
   'metamta.maniphest.reply-handler-domain' => null,
 
   // You can follow the instructions in "Configuring Inbound Email" in the
   // Phabricator documentation and set 'metamta.maniphest.reply-handler-domain'
   // to support updating Maniphest tasks by email. If you want more advanced
   // customization than this provides, you can override the reply handler
   // class with an implementation of your own. This will allow you to do things
   // like have a single public reply handler or change how private reply
   // handlers are generated and validated.
   //
   // This key should be set to a loadable subclass of
   // PhabricatorMailReplyHandler.
   'metamta.maniphest.reply-handler' => 'ManiphestReplyHandler',
 
   // If you don't want phabricator to take up an entire domain
   // (or subdomain for that matter), you can use this and set a common
   // prefix for mail sent by phabricator. It will make use of the fact that
   // a mail-address such as phabricator+D123+1hjk213h@example.com will be
   // delivered to the phabricator users mailbox.
   // Set this to the left part of the email address and it well get
   // prepended to all outgoing mail. If you want to use e.g.
   // 'phabricator@example.com' this should be set to 'phabricator'.
   'metamta.single-reply-handler-prefix' => null,
 
   // Prefix prepended to mail sent by Maniphest. You can change this to
   // distinguish between testing and development installs, for example.
   'metamta.maniphest.subject-prefix' => '[Maniphest]',
 
   // See 'metamta.maniphest.reply-handler-domain'. This does the same thing, but
   // affects Pholio.
   'metamta.pholio.reply-handler-domain' => null,
 
   // Prefix prepended to mail sent by Pholio.
   'metamta.pholio.subject-prefix' => '[Pholio]',
 
   // See 'metamta.maniphest.reply-handler-domain'. This does the same thing, but
   // affects Macro.
   'metamta.macro.reply-handler-domain' => null,
 
   // Prefix prepended to mail sent by Macro.
   'metamta.macro.subject-prefix' => '[Macro]',
 
   // See 'metamta.maniphest.reply-handler-domain'. This does the same thing,
   // but allows email replies via Differential.
   'metamta.differential.reply-handler-domain' => null,
 
   // See 'metamta.maniphest.reply-handler'. This does the same thing, but
   // affects Differential.
   'metamta.differential.reply-handler' => 'DifferentialReplyHandler',
 
   // Prefix prepended to mail sent by Differential.
   'metamta.differential.subject-prefix' => '[Differential]',
 
   // Set this to true if you want patches to be attached to mail from
   // Differential. This won't work if you are using SendGrid as your mail
   // adapter.
   'metamta.differential.attach-patches' => false,
 
   // To include patches in email bodies, set this to a positive integer. Patches
   // will be inlined if they are at most that many lines. For instance, a value
   // of 100 means "inline patches if they are no longer than 100 lines". By
   // default, patches are not inlined.
   'metamta.differential.inline-patches' => 0,
 
   // If you enable either of the options above, you can choose what format
   // patches are sent in. Valid options are 'unified' (like diff -u) or 'git'.
   'metamta.differential.patch-format'   => 'unified',
 
   // Enables a different format for comments in differential emails.
   // Differential will create unified diffs around the comment, which
   // will give enough context for people who are only viewing the
   // reviews in email to understand what is going on. The context will
   // be created based on the range of the comment.
   'metamta.differential.unified-comment-context' => false,
 
   // Prefix prepended to mail sent by Diffusion.
   'metamta.diffusion.subject-prefix' => '[Diffusion]',
 
   // See 'metamta.maniphest.reply-handler-domain'. This does the same thing,
   // but allows email replies via Diffusion.
   'metamta.diffusion.reply-handler-domain' => null,
 
   // See 'metamta.maniphest.reply-handler'. This does the same thing, but
   // affects Diffusion.
   'metamta.diffusion.reply-handler' => 'PhabricatorAuditReplyHandler',
 
   // Set this to true if you want patches to be attached to commit notifications
   // from Diffusion. This won't work with SendGrid.
   'metamta.diffusion.attach-patches' => false,
 
   // To include patches in Diffusion email bodies, set this to a positive
   // integer. Patches will be inlined if they are at most that many lines.
   // By default, patches are not inlined.
   'metamta.diffusion.inline-patches' => 0,
 
   // If you've enabled attached patches or inline patches for commit emails, you
   // can establish a hard byte limit on their size. You should generally set
   // reasonable byte and time limits (defaults are 1MB and 60 seconds) to avoid
   // sending ridiculously enormous email for changes like "importing an external
   // library" or "accidentally committed this full-length movie as text".
   'metamta.diffusion.byte-limit'     => 1024 * 1024,
 
   // If you've enabled attached patches or inline patches for commit emails, you
   // can establish a hard time limit on generating them.
   'metamta.diffusion.time-limit'     => 60,
 
   // Prefix prepended to mail sent by Package.
   'metamta.package.subject-prefix' => '[Package]',
 
   // See 'metamta.maniphest.reply-handler'. This does similar thing for package
   // except that it only supports sending out mail and doesn't handle incoming
   // email.
   'metamta.package.reply-handler' => 'OwnersPackageReplyHandler',
 
   // By default, Phabricator generates unique reply-to addresses and sends a
   // separate email to each recipient when you enable reply handling. This is
   // more secure than using "From" to establish user identity, but can mean
   // users may receive multiple emails when they are on mailing lists. Instead,
   // you can use a single, non-unique reply to address and authenticate users
   // based on the "From" address by setting this to 'true'. This trades away
   // a little bit of security for convenience, but it's reasonable in many
   // installs. Object interactions are still protected using hashes in the
   // single public email address, so objects can not be replied to blindly.
   'metamta.public-replies' => false,
 
   // You can configure an email address like "bugs@phabricator.example.com"
   // which will automatically create Maniphest tasks when users send email
   // to it. This relies on the "From" address to authenticate users, so it is
   // is not completely secure. To set this up, enter a complete email
   // address like "bugs@phabricator.example.com" and then configure mail to
   // that address so it routed to Phabricator (if you've already configured
   // reply handlers, you're probably already done). See "Configuring Inbound
   // Email" in the documentation for more information.
   'metamta.maniphest.public-create-email' => null,
 
   // If you enable 'metamta.public-replies', Phabricator uses "From" to
   // authenticate users. You can additionally enable this setting to try to
   // authenticate with 'Reply-To'. Note that this is completely spoofable and
   // insecure (any user can set any 'Reply-To' address) but depending on the
   // nature of your install or other deliverability conditions this might be
   // okay. Generally, you can't do much more by spoofing Reply-To than be
   // annoying (you can write but not read content). But, you know, this is
   // still **COMPLETELY INSECURE**.
   'metamta.insecure-auth-with-reply-to' => false,
 
   // If you enable 'metamta.maniphest.public-create-email' and create an
   // email address like "bugs@phabricator.example.com", it will default to
   // rejecting mail which doesn't come from a known user. However, you might
   // want to let anyone send email to this address; to do so, set a default
   // author here (a Phabricator username). A typical use of this might be to
   // create a "System Agent" user called "bugs" and use that name here. If you
   // specify a valid username, mail will always be accepted and used to create
   // a task, even if the sender is not a system user. The original email
   // address will be stored in an 'From Email' field on the task.
   'metamta.maniphest.default-public-author' => null,
 
   'metamta.herald.show-hints' => true,
 
   // You can disable the hints under "REPLY HANDLER ACTIONS" if users prefer
   // smaller messages. The actions themselves will still work properly.
   'metamta.reply.show-hints' => true,
 
   // You can disable the "To:" and "Cc:" footers in mail if users prefer
   // smaller messages.
   'metamta.recipients.show-hints' => true,
 
   // If this option is enabled, Phabricator will add a "Precedence: bulk"
   // header to transactional mail (e.g., Differential, Maniphest and Herald
   // notifications). This may improve the behavior of some auto-responder
   // software and prevent it from replying. However, it may also cause
   // deliverability issues -- notably, you currently can not send this header
   // via Amazon SES, and enabling this option with SES will prevent delivery
   // of any affected mail.
   'metamta.precedence-bulk' => false,
 
   // Mail.app on OS X Lion won't respect threading headers unless the subject
   // is prefixed with "Re:". If you enable this option, Phabricator will add
   // "Re:" to the subject line of all mail which is expected to thread. If
   // you've set 'metamta.one-mail-per-recipient', users can override this
   // setting in their preferences.
   'metamta.re-prefix' => false,
 
   // If true, allow MetaMTA to change mail subjects to put text like
   // '[Accepted]' and '[Commented]' in them. This makes subjects more useful,
   // but might break threading on some clients. If you've set
   // 'metamta.one-mail-per-recipient', users can override this setting in their
   // preferences.
   'metamta.vary-subjects' => true,
 
 // -- Auth ------------------------------------------------------------------ //
 
   // If true, email addresses must be verified (by clicking a link in an
   // email) before a user can login. By default, verification is optional
   // unless 'auth.email-domains' is nonempty (see below).
   'auth.require-email-verification' => false,
 
   // You can restrict allowed email addresses to certain domains (like
   // "yourcompany.com") by setting a list of allowed domains here. Users will
   // only be allowed to register using email addresses at one of the domains,
   // and will only be able to add new email addresses for these domains. If
   // you configure this, it implies 'auth.require-email-verification'.
   //
   // To configure email domains, set a list of domains like this:
   //
   //   array(
   //     'yourcompany.com',
   //     'yourcompany.co.uk',
   //   )
   //
   // You should omit the "@" from domains. Note that the domain must match
   // exactly. If you allow "yourcompany.com", that permits "joe@yourcompany.com"
   // but rejects "joe@mail.yourcompany.com".
   'auth.email-domains' => array(),
 
   // You can provide an arbitrary block of HTML here, which will appear on the
   // login screen. Normally, you'd use this to provide login or registration
   // instructions to users.
   'auth.login-message' => null,
 
 
 // -- Accounts -------------------------------------------------------------- //
 
   // Is basic account information (email, real name, profile picture) editable?
   // If you set up Phabricator to automatically synchronize account information
   // from some other authoritative system, you can disable this to ensure
   // information remains consistent across both systems.
   'account.editable'            => true,
 
   // When users set or reset a password, it must have at least this many
   // characters.
   'account.minimum-password-length'  => 8,
 
 
 // -- Recaptcha ------------------------------------------------------------- //
 
   // Is Recaptcha enabled? If disabled, captchas will not appear. You should
   // enable Recaptcha if your install is public-facing, as it hinders
   // brute-force attacks.
   'recaptcha.enabled'           => false,
 
   // Your Recaptcha public key, obtained from Recaptcha.
   'recaptcha.public-key'        => null,
 
   // Your Recaptcha private key, obtained from Recaptcha.
   'recaptcha.private-key'       => null,
 
 
 // -- Misc ------------------------------------------------------------------ //
 
   // This is hashed with other inputs to generate CSRF tokens. If you want, you
   // can change it to some other string which is unique to your install. This
   // will make your install more secure in a vague, mostly theoretical way. But
   // it will take you like 3 seconds of mashing on your keyboard to set it up so
   // you might as well.
   'phabricator.csrf-key'        => '0b7ec0592e0a2829d8b71df2fa269b2c6172eca3',
 
   // This is hashed with other inputs to generate mail tokens. If you want, you
   // can change it to some other string which is unique to your install. In
   // particular, you will want to do this if you accidentally send a bunch of
   // mail somewhere you shouldn't have, to invalidate all old reply-to
   // addresses.
   'phabricator.mail-key'        => '5ce3e7e8787f6e40dfae861da315a5cdf1018f12',
 
 
   // PHP requires that you set a timezone in your php.ini before using date
   // functions, or it will emit a warning. If this isn't possible (for instance,
   // because you are using HPHP) you can set some valid constant for
   // date_default_timezone_set() here and Phabricator will set it on your
   // behalf, silencing the warning.
   'phabricator.timezone'        => null,
 
   // Show stack traces when unhandled exceptions occur, force reloading of
   // static resources (skipping the cache), show an error callout if a page
   // generated PHP errors, warnings, or notices, force disk reads when
   // reloading, and generally make development easier. This option should not
   // be enabled in production.
   'phabricator.developer-mode' => false,
 
   // Should Phabricator show beta applications on the homepage
   'phabricator.show-beta-applications' => false,
 
   // Contains a list of uninstalled applications
   'phabricator.uninstalled-applications' => array(),
 
   // Allowing non-members to interact with tasks over email.
   'phabricator.allow-email-users' => false,
 
 // -- Welcome Screen -------------------------------------------------------- //
 
   // The custom HTML content for the Phabricator welcome screen.
   'welcome.html' => null,
 
 // -- Files ----------------------------------------------------------------- //
 
   // Lists which uploaded file types may be viewed in the browser. If a file
   // has a mime type which does not appear in this list, it will always be
   // downloaded instead of displayed. This is mainly a usability
   // consideration, since browsers tend to freak out when viewing enormous
   // binary files.
   //
   // The keys in this array are viewable mime types; the values are the mime
   // types they will be delivered as when they are viewed in the browser.
   //
   // IMPORTANT: Configure 'security.alternate-file-domain' above! Your install
   // is NOT safe if it is left unconfigured.
   'files.viewable-mime-types' => array(
     'image/jpeg'  => 'image/jpeg',
     'image/jpg'   => 'image/jpg',
     'image/png'   => 'image/png',
     'image/gif'   => 'image/gif',
     'text/plain'  => 'text/plain; charset=utf-8',
     'text/x-diff' => 'text/plain; charset=utf-8',
 
     // ".ico" favicon files, which have mime type diversity. See:
     // http://en.wikipedia.org/wiki/ICO_(file_format)#MIME_type
     'image/x-ico'               => 'image/x-icon',
     'image/x-icon'              => 'image/x-icon',
     'image/vnd.microsoft.icon'  => 'image/x-icon',
   ),
 
   // List of mime types which can be used as the source for an <img /> tag.
   // This should be a subset of 'files.viewable-mime-types' and exclude files
   // like text.
   'files.image-mime-types' => array(
     'image/jpeg'                => true,
     'image/jpg'                 => true,
     'image/png'                 => true,
     'image/gif'                 => true,
     'image/x-ico'               => true,
     'image/x-icon'              => true,
     'image/vnd.microsoft.icon'  => true,
   ),
 
   //  Configuration option for enabling imagemagick
   //  to resize animated profile pictures (gif)
   'files.enable-imagemagick' => false,
 
 // -- Storage --------------------------------------------------------------- //
 
   // Phabricator allows users to upload files, and can keep them in various
   // storage engines. This section allows you to configure which engines
   // Phabricator will use, and how it will use them.
 
   // The largest filesize Phabricator will store in the MySQL BLOB storage
   // engine, which just uses a database table to store files. While this isn't a
   // best practice, it's really easy to set up. Set this to 0 to disable use of
   // the MySQL blob engine.
   'storage.mysql-engine.max-size' => 1000000,
 
   // Phabricator provides a local disk storage engine, which just writes files
   // to some directory on local disk. The webserver must have read/write
   // permissions on this directory. This is straightforward and suitable for
   // most installs, but will not scale past one web frontend unless the path
   // is actually an NFS mount, since you'll end up with some of the files
   // written to each web frontend and no way for them to share. To use the
   // local disk storage engine, specify the path to a directory here. To
   // disable it, specify null.
   'storage.local-disk.path'       => null,
 
   // If you want to store files in Amazon S3, specify an AWS access and secret
   // key here and a bucket name below.
   'amazon-s3.access-key'          =>  null,
   'amazon-s3.secret-key'          =>  null,
 
   // To use a custom endpoint, specify it here. Normally, you do not need to
   // configure this.
   'amazon-s3.endpoint'            =>  null,
 
   // Set this to a valid Amazon S3 bucket to store files there. You must also
   // configure S3 access keys above.
   'storage.s3.bucket'             => null,
 
   // Phabricator uses a storage engine selector to choose which storage engine
   // to use when writing file data. If you add new storage engines or want to
   // provide very custom rules (e.g., write images to one storage engine and
   // other files to a different one), you can provide an alternate
   // implementation here. The default engine will use choose MySQL, Local Disk,
   // and S3, in that order, if they have valid configurations above and a file
   // fits within configured limits.
   'storage.engine-selector' => 'PhabricatorDefaultFileStorageEngineSelector',
 
   // Set the size of the largest file a user may upload. This is used to render
   // text like "Maximum file size: 10MB" on interfaces where users can upload
   // files, and files larger than this size will be rejected.
   //
   // Specify this limit in bytes, or using a "K", "M", or "G" suffix.
   //
   // NOTE: Setting this to a large size is NOT sufficient to allow users to
   // upload large files. You must also configure a number of other settings. To
   // configure file upload limits, consult the article "Configuring File Upload
   // Limits" in the documentation. Once you've configured some limit across all
   // levels of the server, you can set this limit to an appropriate value and
   // the UI will then reflect the actual configured limit.
   'storage.upload-size-limit'   => null,
 
   // Phabricator puts databases in a namespace, which defualts to "phabricator"
   // -- for instance, the Differential database is named
   // "phabricator_differential" by default. You can change this namespace if you
   // want. Normally, you should not do this unless you are developing
   // Phabricator and using namespaces to separate multiple sandbox datasets.
   'storage.default-namespace'    => 'phabricator',
 
 
 // -- Search ---------------------------------------------------------------- //
 
   // Phabricator supports Elastic Search; to use it, specify a host like
   // 'http://elastic.example.com:9200/' here.
   'search.elastic.host'     => null,
 
   // Phabricator uses a search engine selector to choose which search engine
   // to use when indexing and reconstructing documents, and when executing
   // queries. You can override the engine selector to provide a new selector
   // class which can select some custom engine you implement, if you want to
   // store your documents in some search engine which does not have default
   // support.
   'search.engine-selector'  => 'PhabricatorDefaultSearchEngineSelector',
 
 
 // -- Differential ---------------------------------------------------------- //
 
   // List of file regexps where whitespace is meaningful and should not
   // use 'ignore-all' by default
   'differential.whitespace-matters' => array(
     '/\.py$/',
     '/\.l?hs$/',
   ),
 
   // Differential has a required "Test Plan" field by default. You can make it
   // optional by setting this to false. You can also completely remove it above,
   // if you prefer.
   'differential.require-test-plan-field' => true,
 
   // If you set this to true, users can "!accept" revisions via email (normally,
   // they can take other actions but can not "!accept"). This action is disabled
   // by default because email authentication can be configured to be very weak,
   // and, socially, email "!accept" is kind of sketchy and implies revisions may
   // not actually be receiving thorough review.
   'differential.enable-email-accept' => false,
 
   // List of file regexps that should be treated as if they are generated by
   // an automatic process, and thus get hidden by default in differential.
   'differential.generated-paths' => array(
     // '/config\.h$/',
     // '#/autobuilt/#',
   ),
 
-  // If you set this to true, users can accept their own revisions.  This action
+  // If you set this to true, users can accept their own revisions. This action
   // is disabled by default because it's most likely not a behavior you want,
   // but it proves useful if you are working alone on a project and want to make
   // use of all of differential's features.
   'differential.allow-self-accept' => false,
 
   // If you set this to true, any user can close any revision so long as it has
   // been accepted. This can be useful depending on your development model. For
   // example, github-style pull requests where the reviewer is often the
   // actual committer can benefit from turning this option to true. If false,
   // only the submitter can close a revision.
   'differential.always-allow-close' => false,
 
   // If you set this to true, any user can abandon any revision. If false, only
   // the submitter can abandon a revision.
   'differential.always-allow-abandon' => false,
 
   // If you set this to true, any user can reopen a revision so long as it has
   // been closed.  This can be useful if a revision is accidentally closed or
-  // if a developer changes his or her mind after closing a revision.  If it is
+  // if a developer changes his or her mind after closing a revision. If it is
   // false, reopening is not allowed.
   'differential.allow-reopen' => false,
 
   // Revisions newer than this number of days are marked as fresh in Action
   // Required and Revisions Waiting on You views. Only work days (not weekends
   // and holidays) are included. Set to 0 to disable this feature.
   'differential.days-fresh' => 1,
 
   // Similar to 'differential.days-fresh' but marks stale revisions. If the
   // revision is even older than it is marked as old.
   'differential.days-stale' => 3,
 
 // -- Repositories ---------------------------------------------------------- //
 
   // The default location in which to store local copies of repositories.
   // Anything stored in this directory will be assumed to be under the
   // control of phabricator, which means that Phabricator will try to do some
   // maintenance on working copies if there are problems (such as a change
   // to the remote origin url). This maintenance may include completely
   // removing (and recloning) anything in this directory.
   //
   // When set to null, this option is ignored (i.e. Phabricator will not fully
   // control any working copies).
   'repository.default-local-path' => null,
 
 // -- Maniphest ------------------------------------------------------------- //
 
   // What should the default task priority be in create flows?
   // See the constants in @{class:ManiphestTaskPriority} for valid values.
   // Defaults to "needs triage".
   'maniphest.default-priority' => 90,
 
 // -- Phame ----------------------------------------------------------------- //
 
   // Should Phame users have Disqus comment widget, and if so what's the
   // website shortname to use? For example, secure.phabricator.org uses
   // "phabricator", which we registered with Disqus. If you aren't familiar
   // with Disqus, see:
   // Disqus quick start guide - http://docs.disqus.com/help/4/
   // Information on shortnames - http://docs.disqus.com/help/68/
   'disqus.shortname'            => null,
 
   // Directories to look for Phame skins inside of.
   'phame.skins' => array(
     'externals/skins/',
   ),
 
 // -- Remarkup -------------------------------------------------------------- //
 
   // If you enable this, linked YouTube videos will be embeded inline. This has
   // mild security implications (you'll leak referrers to YouTube) and is pretty
   // silly (but sort of awesome).
   'remarkup.enable-embedded-youtube' => false,
 
 
 // -- Cache ----------------------------------------------------------------- //
 
   // Set this to false to disable the use of gzdeflate()-based compression in
   // some caches. This may give you less performant (but more debuggable)
   // caching.
   'cache.enable-deflate' => true,
 
 // -- Garbage Collection ---------------------------------------------------- //
 
   // Phabricator generates various logs and caches in the database which can
   // be garbage collected after a while to make the total data size more
   // manageable. To run garbage collection, launch a
   // PhabricatorGarbageCollector daemon.
 
   // These 'ttl' keys configure how much old data the GC daemon keeps around.
   // Objects older than the ttl will be collected. Set any value to 0 to store
   // data indefinitely.
 
   'gcdaemon.ttl.herald-transcripts'         => 30 * (24 * 60 * 60),
   'gcdaemon.ttl.daemon-logs'                =>  7 * (24 * 60 * 60),
   'gcdaemon.ttl.differential-parse-cache'   => 14 * (24 * 60 * 60),
   'gcdaemon.ttl.markup-cache'               => 30 * (24 * 60 * 60),
   'gcdaemon.ttl.task-archive'               => 14 * (24 * 60 * 60),
   'gcdaemon.ttl.general-cache'              => 30 * (24 * 60 * 60),
 
 
 // -- Feed ------------------------------------------------------------------ //
 
   // If you set this to true, you can embed Phabricator activity feeds in other
   // pages using iframes. These feeds are completely public, and a login is not
   // required to view them! This is intended for things like open source
   // projects that want to expose an activity feed on the project homepage.
   //
   // NOTE: You must also set `policy.allow-public` to true for this setting
   // to work properly.
   'feed.public' => false,
 
   // If you set this to a list of http URIs, when a feed story is published a
   // task will be created for each uri that posts the story data to the uri.
   // Daemons automagically retry failures 100 times, waiting $fail_count * 60s
   // between each subsequent failure. Be sure to keep the daemon console
   // (/daemon/) open while developing and testing your end points. You may need
   // to restart your daemons to start sending http requests.
   //
   // NOTE: URIs are not validated, the URI must return http status 200 within
   // 30 seconds, and no permission checks are performed.
   'feed.http-hooks' => array(),
 
 // -- Drydock --------------------------------------------------------------- //
 
   // If you want to use Drydock's builtin EC2 Blueprints, configure your AWS
   // EC2 credentials here.
   'amazon-ec2.access-key'   => null,
   'amazon-ec2.secret-key'   => null,
 
 
 // -- Customization --------------------------------------------------------- //
 
   // Paths to additional phutil libraries to load.
   'load-libraries' => array(),
 
   'aphront.default-application-configuration-class' =>
     'AphrontDefaultApplicationConfiguration',
 
   // Directory that phd (the Phabricator daemon control script) should use to
   // track running daemons.
   'phd.pid-directory' => '/var/tmp/phd/pid',
 
   // Directory that the Phabricator daemons should use to store the log file
   'phd.log-directory' => '/var/tmp/phd/log',
 
   // Number of "TaskMaster" daemons that "phd start" should start. You can
   // raise this if you have a task backlog, or explicitly launch more with
   // "phd launch <N> taskmaster".
   'phd.start-taskmasters' => 4,
 
   // Launch daemons in "verbose" mode by default. This creates a lot of output,
   // but can help debug issues. Daemons launched in debug mode with "phd debug"
   // are always launched in verbose mode. See also 'phd.trace'.
   'phd.verbose' => false,
 
   // Launch daemons in "trace" mode by default. This creates an ENORMOUS amount
   // of output, but can help debug issues. Daemons launched in debug mode with
   // "phd debug" are always launched in trace mdoe. See also 'phd.verbose'.
   'phd.trace' => false,
 
   // This value is an input to the hash function when building resource hashes.
   // It has no security value, but if you accidentally poison user caches (by
   // pushing a bad patch or having something go wrong with a CDN, e.g.) you can
   // change this to something else and rebuild the Celerity map to break user
   // caches. Unless you are doing Celerity development, it is exceptionally
   // unlikely that you need to modify this.
   'celerity.resource-hash' => 'd9455ea150622ee044f7931dabfa52aa',
 
   // Minify static resources by removing whitespace and comments. You should
   // enable this in production, but disable it in development.
   'celerity.minify' => true,
 
   // You can respond to various application events by installing listeners,
   // which will receive callbacks when interesting things occur. Specify a list
   // of classes which extend PhabricatorEventListener here.
   'events.listeners'  => array(),
 
 // -- Syntax Highlighting --------------------------------------------------- //
 
   // Phabricator can highlight PHP by default and use Pygments for other
   // languages if enabled. You can provide a custom highlighter engine by
   // extending class PhutilSyntaxHighlighterEngine.
   'syntax-highlighter.engine' => 'PhutilDefaultSyntaxHighlighterEngine',
 
   // If you want syntax highlighting for other languages than PHP then you can
   // install the python package 'Pygments', make sure the 'pygmentize' script is
   //  available in the $PATH of the webserver, and then enable this.
   'pygments.enabled'            => false,
 
   // In places that we display a dropdown to syntax-highlight code,
   // this is where that list is defined.
   // Syntax is 'lexer-name' => 'Display Name',
   'pygments.dropdown-choices' => array(
     'apacheconf' => 'Apache Configuration',
     'bash' => 'Bash Scripting',
     'brainfuck' => 'Brainf*ck',
     'c' => 'C',
     'coffee-script' => 'CoffeeScript',
     'cpp' => 'C++',
     'css' => 'CSS',
     'd' => 'D',
     'diff' => 'Diff',
     'django' => 'Django Templating',
     'erb' => 'Embedded Ruby/ERB',
     'erlang' => 'Erlang',
     'go' => 'Golang',
     'groovy' => 'Groovy',
     'haskell' => 'Haskell',
     'html' => 'HTML',
     'java' => 'Java',
     'js' => 'Javascript',
     'json' => 'JSON',
     'mysql' => 'MySQL',
     'objc' => 'Objective-C',
     'perl' => 'Perl',
     'php' => 'PHP',
     'puppet' => 'Puppet',
     'rest' => 'reStructuredText',
     'text' => 'Plain Text',
     'python' => 'Python',
     'rainbow' => 'Rainbow',
     'remarkup' => 'Remarkup',
     'ruby' => 'Ruby',
     'xml' => 'XML',
     'yaml' => 'YAML',
   ),
 
   // This is an override list of regular expressions which allows you to choose
   // what language files are highlighted as. If your projects have certain rules
   // about filenames or use unusual or ambiguous language extensions, you can
   // create a mapping here. This is an ordered dictionary of regular expressions
   // which will be tested against the filename. They should map to either an
   // explicit language as a string value, or a numeric index into the captured
   // groups as an integer.
   'syntax.filemap' => array(
     // Example: Treat all '*.xyz' files as PHP.
     // '@\\.xyz$@' => 'php',
 
     // Example: Treat 'httpd.conf' as 'apacheconf'.
     // '@/httpd\\.conf$@' => 'apacheconf',
 
     // Example: Treat all '*.x.bak' file as '.x'. NOTE: we map to capturing
     // group 1 by specifying the mapping as "1".
     // '@\\.([^.]+)\\.bak$@' => 1,
 
     '@\.arcconfig$@' => 'js',
     '@\.arclint$@' => 'js',
     '@\.divinerconfig$@' => 'js',
   ),
 
   // Set the default monospaced font style for users who haven't set a custom
   // style.
   'style.monospace' => '10px "Menlo", "Consolas", "Monaco", monospace',
   'style.monospace.windows' => '11px "Menlo", "Consolas", "Monaco", monospace',
 
 
 // -- Debugging ------------------------------------------------------------- //
 
   // Enable this to change HTTP redirects into normal pages with a link to the
   // redirection target. For example, after you submit a form you'll get a page
   // saying "normally, you'd be redirected...". This is useful to examine
   // service or profiler information on write pathways, or debug redirects. It
   // also makes the UX horrible for normal use, so you should enable it only
   // when debugging.
   //
   // NOTE: This does not currently work for forms with Javascript "workflow",
   // since the redirect happens in Javascript.
   'debug.stop-on-redirect'    => false,
 
   // Set the rate for how often to do sampled profiling. On average, one
   // request for every number of requests specified here will be sampled.
   // Set this value to 0 to completely disable profiling. In a production
   // environment, this value should either be set to 0 (to disable) or to
   // a large number (to sample only a few requests).
   'debug.profile-rate' => 0,
 
 // -- Environment  ---------------------------------------------------------- //
 
   // Phabricator occasionally shells out to other binaries on the server.
   // An example of this is the "pygmentize" command, used to syntax-highlight
   // code written in languages other than PHP. By default, it is assumed that
   // these binaries are in the $PATH of the user running Phabricator (normally
   // 'apache', 'httpd', or 'nobody'). Here you can add extra directories to
   // the $PATH environment variable, for when these binaries are in non-standard
   // locations.
   'environment.append-paths' => array(),
 
 // -- Audit  ---------------------------------------------------------- //
 
   // Controls whether or not task creator can Close Audits
   'audit.can-author-close-audit' => false,
 );
diff --git a/externals/balanced-php/tests/Balanced/SuiteTest.php b/externals/balanced-php/tests/Balanced/SuiteTest.php
index 83cdbb162d..9c324b912d 100644
--- a/externals/balanced-php/tests/Balanced/SuiteTest.php
+++ b/externals/balanced-php/tests/Balanced/SuiteTest.php
@@ -1,800 +1,798 @@
 <?php
 
 namespace Balanced\Test;
 
 \Balanced\Bootstrap::init();
 \RESTful\Bootstrap::init();
 \Httpful\Bootstrap::init();
 
 use Balanced\Settings;
 use Balanced\APIKey;
 use Balanced\Marketplace;
 use Balanced\Credit;
 use Balanced\Debit;
 use Balanced\Refund;
 use Balanced\Account;
 use Balanced\Merchant;
 use Balanced\BankAccount;
 use Balanced\Card;
 
 
 /**
  * Suite test cases. These talk to an API server and so make network calls.
  *
  * Environment variables can be used to control client settings:
  *
  * <ul>
  *     <li>$BALANCED_URL_ROOT If set applies to \Balanced\Settings::$url_root.
  *     <li>$BALANCED_API_KEY If set applies to \Balanced\Settings::$api_key.
  * </ul>
- *
- * @group suite
  */
 class SuiteTest extends \PHPUnit_Framework_TestCase
 {
     static $key,
            $marketplace,
            $email_counter = 0;
 
     static function _createBuyer($email_address = null, $card = null)
     {
         if ($email_address == null)
             $email_address = sprintf('m+%d@poundpay.com', self::$email_counter++);
         if ($card == null)
             $card = self::_createCard();
         return self::$marketplace->createBuyer(
             $email_address,
             $card->uri,
             array('test#' => 'test_d'),
             'Hobo Joe'
         );
     }
 
     static function _createCard($account = null)
     {
         $card = self::$marketplace->createCard(
             '123 Fake Street',
             'Jollywood',
             null,
             '90210',
             'khalkhalash',
             '4112344112344113',
             null,
             12,
             2013);
         if ($account != null) {
             $account->addCard($card);
             $card = Card::get($card->uri);
         }
         return $card;
     }
 
     static function _createBankAccount($account = null)
     {
         $bank_account = self::$marketplace->createBankAccount(
             'Homer Jay',
             '112233a',
             '121042882',
             'checking'
             );
         if ($account != null) {
             $account->addBankAccount($bank_account);
             $bank_account  = $account->bank_accounts[0];
         }
         return $bank_account;
     }
 
     public static function _createPersonMerchant($email_address = null, $bank_account = null)
     {
         if ($email_address == null)
             $email_address = sprintf('m+%d@poundpay.com', self::$email_counter++);
         if ($bank_account == null)
             $bank_account = self::_createBankAccount();
         $merchant = array(
             'type' => 'person',
             'name' => 'William James',
             'tax_id' => '393-48-3992',
             'street_address' => '167 West 74th Street',
             'postal_code' => '10023',
             'dob' => '1842-01-01',
             'phone_number' => '+16505551234',
             'country_code' => 'USA'
             );
         return self::$marketplace->createMerchant(
             $email_address,
             $merchant,
             $bank_account->uri
             );
     }
 
     public static function _createBusinessMerchant($email_address = null, $bank_account = null)
     {
         if ($email_address == null)
             $email_address = sprintf('m+%d@poundpay.com', self::$email_counter++);
         if ($bank_account == null)
             $bank_account = self::_createBankAccount();
         $merchant = array(
             'type' => 'business',
             'name' => 'Levain Bakery',
             'tax_id' => '253912384',
             'street_address' => '167 West 74th Street',
             'postal_code' => '10023',
             'phone_number' => '+16505551234',
             'country_code' => 'USA',
             'person' => array(
                 'name' => 'William James',
                 'tax_id' => '393483992',
                 'street_address' => '167 West 74th Street',
                 'postal_code' => '10023',
                 'dob' => '1842-01-01',
                 'phone_number' => '+16505551234',
                 'country_code' => 'USA',
                 ),
             );
         return self::$marketplace->createMerchant(
             $email_address,
             $merchant,
             $bank_account->uri
             );
     }
 
     public static function setUpBeforeClass()
     {
         // url root
         $url_root = getenv('BALANCED_URL_ROOT');
         if ($url_root != '') {
             Settings::$url_root = $url_root;
         }
         else
             Settings::$url_root = 'https://api.balancedpayments.com';
 
         // api key
         $api_key = getenv('BALANCED_API_KEY');
         if ($api_key != '') {
             Settings::$api_key = $api_key;
         }
         else {
             self::$key = new APIKey();
             self::$key->save();
             Settings::$api_key = self::$key->secret;
         }
 
         // marketplace
         try {
             self::$marketplace = Marketplace::mine();
         }
         catch(\RESTful\Exceptions\NoResultFound $e) {
             self::$marketplace = new Marketplace();
             self::$marketplace->save();
         }
     }
 
     function testMarketplaceMine()
     {
         $marketplace = Marketplace::mine();
         $this->assertEquals($this::$marketplace->id, $marketplace->id);
     }
 
     /**
      * @expectedException \RESTful\Exceptions\HTTPError
      */
     function testAnotherMarketplace()
     {
         $marketplace = new Marketplace();
         $marketplace->save();
     }
 
     /**
      * @expectedException \RESTful\Exceptions\HTTPError
      */
     function testDuplicateEmailAddress()
     {
         self::_createBuyer('dupe@poundpay.com');
         self::_createBuyer('dupe@poundpay.com');
     }
 
     function testIndexMarketplace()
     {
         $marketplaces = Marketplace::query()->all();
         $this->assertEquals(count($marketplaces), 1);
     }
 
     function testCreateBuyer()
     {
         self::_createBuyer();
     }
 
     function testCreateAccountWithoutEmailAddress()
     {
     	self::$marketplace->createAccount();
     }
 
     function testFindOrCreateAccountByEmailAddress()
     {
     	$account1 = self::$marketplace->createAccount('foc@example.com');
     	$account2 = self::$marketplace->findOrCreateAccountByEmailAddress('foc@example.com');
     	$this->assertEquals($account2->id, $account2->id);
     	$account3 = self::$marketplace->findOrCreateAccountByEmailAddress('foc2@example.com');
     	$this->assertNotEquals($account3->id, $account1->id);
     }
 
     function testGetBuyer()
     {
         $buyer1 = self::_createBuyer();
         $buyer2 = Account::get($buyer1->uri);
         $this->assertEquals($buyer1->id, $buyer2->id);
     }
 
 
     function testMe()
     {
         $marketplace = Marketplace::mine();
         $merchant = Merchant::me();
         $this->assertEquals($marketplace->id, $merchant->marketplace->id);
     }
 
     function testDebitAndRefundBuyer()
     {
         $buyer = self::_createBuyer();
         $debit = $buyer->debit(
             1000,
             'Softie',
             'something i bought',
             array('hi' => 'bye')
             );
         $refund = $debit->refund(100);
     }
 
     /**
      * @expectedException \RESTful\Exceptions\HTTPError
      */
     function testDebitZero()
     {
     	$buyer = self::_createBuyer();
     	$debit = $buyer->debit(
     			0,
     			'Softie',
     			'something i bought'
     	);
     }
 
     function testMultipleRefunds()
     {
         $buyer = self::_createBuyer();
         $debit = $buyer->debit(
             1500,
             'Softie',
             'something tart',
             array('hi' => 'bye'));
         $refunds = array(
             $debit->refund(100),
             $debit->refund(100),
             $debit->refund(100),
             $debit->refund(100));
         $expected_refund_ids = array_map(
             function($x) {
                 return $x->id;
             }, $refunds);
         sort($expected_refund_ids);
         $this->assertEquals($debit->refunds->total(), 4);
 
         // itemization
         $total = 0;
         $refund_ids = array();
         foreach ($debit->refunds as $refund) {
             $total += $refund->amount;
              array_push($refund_ids, $refund->id);
         }
         sort($refund_ids);
         $this->assertEquals($total, 400);
         $this->assertEquals($expected_refund_ids, $refund_ids);
 
         // pagination
         $total = 0;
         $refund_ids = array();
         foreach ($debit->refunds->paginate() as $page) {
             foreach ($page->items as $refund) {
                 $total += $refund->amount;
                 array_push($refund_ids, $refund->id);
             }
         }
         sort($refund_ids);
         $this->assertEquals($total, 400);
         $this->assertEquals($expected_refund_ids, $refund_ids);
     }
 
     function testDebitSource()
     {
         $buyer = self::_createBuyer();
         $card1 = self::_createCard($buyer);
         $card2 = self::_createCard($buyer);
 
         $credit = $buyer->debit(
             1000,
             'Softie',
             'something i bought'
             );
         $this->assertEquals($credit->source->id, $card2->id);
 
         $credit = $buyer->debit(
             1000,
             'Softie',
             'something i bought',
             null,
             $card1
             );
         $this->assertEquals($credit->source->id, $card1->id);
     }
 
     function testDebitOnBehalfOf()
     {
         $buyer = self::_createBuyer();
         $merchant = self::$marketplace->createAccount(null);
         $card1 = self::_createCard($buyer);
 
         $debit = $buyer->debit(1000, null, null, null, null, $merchant);
         $this->assertEquals($debit->amount, 1000);
         // for now just test the debit succeeds.
         // TODO: once the on_behalf_of actually shows up on the response, test it.
     }
 
     /**
      * @expectedException \InvalidArgumentException
      */
     function testDebitOnBehalfOfFailsForBuyer()
     {
         $buyer = self::_createBuyer();
         $card1 = self::_createCard($buyer);
         $debit = $buyer->debit(1000, null, null, null, null, $buyer);
     }
 
     function testCreateAndVoidHold()
     {
         $buyer = self::_createBuyer();
         $hold = $buyer->hold(1000);
         $this->assertEquals($hold->is_void, false);
         $hold->void();
         $this->assertEquals($hold->is_void, true);
     }
 
     function testCreateAndCaptureHold()
     {
         $buyer = self::_createBuyer();
         $hold = $buyer->hold(1000);
         $debit = $hold->capture(909);
         $this->assertEquals($debit->account->id, $buyer->id);
         $this->assertEquals($debit->hold->id, $hold->id);
         $this->assertEquals($hold->debit->id, $debit->id);
     }
 
     function testCreatePersonMerchant()
     {
         $merchant = self::_createPersonMerchant();
     }
 
     function testCreateBusinessMerchant()
     {
         $merchant = self::_createBusinessMerchant();
     }
 
     /**
      * @expectedException \RESTful\Exceptions\HTTPError
      */
     function testCreditRequiresNonZeroAmount()
     {
         $buyer = self::_createBuyer();
         $buyer->debit(
             1000,
             'Softie',
             'something i bought'
             );
         $merchant = self::_createBusinessMerchant();
         $merchant->credit(0);
     }
 
     /**
      * @expectedException \RESTful\Exceptions\HTTPError
      */
     function testCreditMoreThanEscrowBalanceFails()
     {
         $buyer = self::_createBuyer();
         $buyer->credit(
             1000,
             'something i bought',
             null,
             null,
             'Softie'
             );
         $merchant = self::_createBusinessMerchant();
         $merchant->credit(self::$marketplace->in_escrow + 1);
     }
 
     function testCreditDestiation()
     {
         $buyer = self::_createBuyer();
         $buyer->debit(3000);  # NOTE: build up escrow balance to credit
 
         $merchant = self::_createPersonMerchant();
         $bank_account1 = self::_createBankAccount($merchant);
         $bank_account2 = self::_createBankAccount($merchant);
 
         $credit = $merchant->credit(
             1000,
             'something i sold',
             null,
             null,
             'Softie'
             );
         $this->assertEquals($credit->destination->id, $bank_account2->id);
 
         $credit = $merchant->credit(
             1000,
             'something i sold',
             null,
             $bank_account1,
             'Softie'
             );
         $this->assertEquals($credit->destination->id, $bank_account1->id);
     }
 
     function testAssociateCard()
     {
         $merchant = self::_createPersonMerchant();
         $card = self::_createCard();
         $merchant->addCard($card->uri);
     }
 
     function testAssociateBankAccount()
     {
         $merchant = self::_createPersonMerchant();
         $bank_account = self::_createBankAccount();
         $merchant->addBankAccount($bank_account->uri);
     }
 
     function testCardMasking()
     {
         $card = self::$marketplace->createCard(
             '123 Fake Street',
             'Jollywood',
             null,
             '90210',
             'khalkhalash',
             '4112344112344113',
             '123',
             12,
             2013);
         $this->assertEquals($card->last_four, '4113');
         $this->assertFalse(property_exists($card, 'number'));
     }
 
     function testBankAccountMasking()
     {
         $bank_account = self::$marketplace->createBankAccount(
             'Homer Jay',
             '112233a',
             '121042882',
             'checking'
             );
         $this->assertEquals($bank_account->last_four, '233a');
         $this->assertEquals($bank_account->account_number, 'xxx233a');
     }
 
     function testFilteringAndSorting()
     {
         $buyer = self::_createBuyer();
         $debit1 = $buyer->debit(1122, null, null, array('tag' => '1'));
         $debit2 = $buyer->debit(3322, null, null, array('tag' => '1'));
         $debit3 = $buyer->debit(2211, null, null, array('tag' => '2'));
 
         $getId = function($o) {
             return $o->id;
         };
 
         $debits = (
             self::$marketplace->debits->query()
             ->filter(Debit::$f->meta->tag->eq('1'))
             ->sort(Debit::$f->created_at->asc())
             ->all());
         $debit_ids = array_map($getId, $debits);
         $this->assertEquals($debit_ids, array($debit1->id, $debit2->id));
 
         $debits = (
             self::$marketplace->debits->query()
             ->filter(Debit::$f->meta->tag->eq('2'))
             ->all());
         $debit_ids = array_map($getId, $debits);
         $this->assertEquals($debit_ids, array($debit3->id));
 
         $debits = (
             self::$marketplace->debits->query()
             ->filter(Debit::$f->meta->contains('tag'))
             ->sort(Debit::$f->created_at->asc())
             ->all());
         $debit_ids = array_map($getId, $debits);
         $this->assertEquals($debit_ids, array($debit1->id, $debit2->id, $debit3->id));
 
         $debits = (
             self::$marketplace->debits->query()
             ->filter(Debit::$f->meta->contains('tag'))
             ->sort(Debit::$f->amount->desc())
             ->all());
         $debit_ids = array_map($getId, $debits);
         $this->assertEquals($debit_ids, array($debit2->id, $debit3->id, $debit1->id));
     }
 
     function testMerchantIdentityFailure()
     {
         // NOTE: postal_code == '99999' && region == 'EX' triggers identity failure
         $identity = array(
             'type' => 'business',
             'name' => 'Levain Bakery',
             'tax_id' => '253912384',
             'street_address' => '167 West 74th Street',
             'postal_code' => '99999',
             'region' => 'EX',
             'phone_number' => '+16505551234',
             'country_code' => 'USA',
             'person' => array(
                 'name' => 'William James',
                 'tax_id' => '393483992',
                 'street_address' => '167 West 74th Street',
                 'postal_code' => '99999',
                 'region' => 'EX',
                 'dob' => '1842-01-01',
                 'phone_number' => '+16505551234',
                 'country_code' => 'USA',
                 ),
             );
 
         try {
             self::$marketplace->createMerchant(
                 sprintf('m+%d@poundpay.com', self::$email_counter++),
                 $identity);
         }
         catch(\RESTful\Exceptions\HTTPError $e) {
             $this->assertEquals($e->response->code, 300);
             $expected = sprintf('https://www.balancedpayments.com/marketplaces/%s/kyc', self::$marketplace->id);
             $this->assertEquals($e->redirect_uri, $expected);
             $this->assertEquals($e->response->headers['Location'], $expected);
             return;
         }
         $this->fail('Expected exception HTTPError not raised.');
     }
 
     function testInternationalCard()
     {
         $payload = array(
             'card_number' => '4111111111111111',
             'city' => '\xe9\x83\xbd\xe7\x95\x99\xe5\xb8\x82',
             'country_code' => 'JPN',
             'expiration_month' => 12,
             'expiration_year' => 2014,
             'name' => 'Johnny Fresh',
             'postal_code' => '4020054',
             'street_address' => '\xe7\x94\xb0\xe5\x8e\x9f\xef\xbc\x93\xe3\x83\xbc\xef\xbc\x98\xe3\x83\xbc\xef\xbc\x91'
             );
         $card = self::$marketplace->cards->create($payload);
         $this->assertEquals($card->street_address, $payload['street_address']);
     }
 
     /**
      * @expectedException \RESTful\Exceptions\NoResultFound
      */
     function testAccountWithEmailAddressNotFound()
     {
         self::$marketplace->accounts->query()
             ->filter(Account::$f->email_address->eq('unlikely@address.com'))
             ->one();
     }
 
     function testDebitACard()
     {
         $buyer = self::_createBuyer();
         $card = self::_createCard($buyer);
         $debit = $card->debit(
             1000,
             'Softie',
             'something i bought',
             array('hi' => 'bye'));
         $this->assertEquals($debit->source->uri, $card->uri);
     }
 
     /**
      * @expectedException \UnexpectedValueException
      */
     function testDebitAnUnassociatedCard()
     {
         $card = self::_createCard();
         $card->debit(1000, 'Softie');
     }
 
     function testCreditABankAccount()
     {
         $buyer = self::_createBuyer();
         $buyer->debit(101);  # NOTE: build up escrow balance to credit
 
         $merchant = self::_createPersonMerchant();
         $bank_account = self::_createBankAccount($merchant);
         $credit = $bank_account->credit(55, 'something sour');
         $this->assertEquals($credit->destination->uri, $bank_account->uri);
     }
 
     function testQuery()
     {
         $buyer = self::_createBuyer();
         $tag = '123123123123';
         $debit1 = $buyer->debit(1122, null, null, array('tag' => $tag));
         $debit2 = $buyer->debit(3322, null, null, array('tag' => $tag));
         $debit3 = $buyer->debit(2211, null, null, array('tag' => $tag));
         $expected_debit_ids = array($debit1->id, $debit2->id, $debit3->id);
 
         $query = (
             self::$marketplace->debits->query()
             ->filter(Debit::$f->meta->tag->eq($tag))
             ->sort(Debit::$f->created_at->asc())
             ->limit(1));
 
         $this->assertEquals($query->total(), 3);
 
         $debit_ids = array();
         foreach ($query as $debits) {
             array_push($debit_ids, $debits->id);
         }
         $this->assertEquals($debit_ids, $expected_debit_ids);
 
         $debit_ids = array($query[0]->id, $query[1]->id, $query[2]->id);
         $this->assertEquals($debit_ids, $expected_debit_ids);
     }
 
     function testBuyerPromoteToMerchant()
     {
     	$merchant = array(
             'type' => 'person',
             'name' => 'William James',
             'tax_id' => '393-48-3992',
             'street_address' => '167 West 74th Street',
             'postal_code' => '10023',
             'dob' => '1842-01-01',
             'phone_number' => '+16505551234',
             'country_code' => 'USA'
     	);
     	$buyer = self::_createBuyer();
     	$buyer->promoteToMerchant($merchant);
     }
 
     function testCreditAccountlessBankAccount()
     {
         $buyer = self::_createBuyer();
         $buyer->debit(101);  # NOTE: build up escrow balance to credit
 
         $bank_account = self::_createBankAccount();
         $credit = $bank_account->credit(55, 'something sour');
         $this->assertEquals($credit->bank_account->id, $bank_account->id);
         $bank_account = $bank_account->get($bank_account->id);
         $this->assertEquals($bank_account->credits->total(), 1);
     }
 
     function testCreditUnstoredBankAccount()
     {
         $buyer = self::_createBuyer();
         $buyer->debit(101);  # NOTE: build up escrow balance to credit
 
         $credit = Credit::bankAccount(
             55,
             array(
                 'name' => 'Homer Jay',
                 'account_number' => '112233a',
                 'routing_number' => '121042882',
                 'type' => 'checking',
             ),
             'something sour');
         $this->assertFalse(property_exists($credit->bank_account, 'uri'));
         $this->assertFalse(property_exists($credit->bank_account, 'id'));
         $this->assertEquals($credit->bank_account->name, 'Homer Jay');
         $this->assertEquals($credit->bank_account->account_number, 'xxx233a');
         $this->assertEquals($credit->bank_account->type, 'checking');
     }
 
     function testDeleteBankAccount()
     {
         $buyer = self::_createBuyer();
         $buyer->debit(101);  # NOTE: build up escrow balance to credit
 
         $bank_account = self::_createBankAccount();
         $credit = $bank_account->credit(55, 'something sour');
         $this->assertTrue(property_exists($credit->bank_account, 'uri'));
         $this->assertTrue(property_exists($credit->bank_account, 'id'));
         $bank_account = BankAccount::get($bank_account->id);
         $bank_account->delete();
         $credit = Credit::get($credit->uri);
         $this->assertFalse(property_exists($credit->bank_account, 'uri'));
         $this->assertFalse(property_exists($credit->bank_account, 'id'));
     }
 
     function testGetBankAccounById()
     {
         $bank_account = self::_createBankAccount();
         $bank_account_2 = BankAccount::get($bank_account->id);
         $this->assertEquals($bank_account_2->id, $bank_account->id);
     }
 
     /**
      * @expectedException \Balanced\Errors\InsufficientFunds
      */
     function testInsufficientFunds()
     {
         $marketplace = Marketplace::get(self::$marketplace->uri);
         $amount = $marketplace->in_escrow + 100;
         $credit = Credit::bankAccount(
             $amount,
             array(
                 'name' => 'Homer Jay',
                 'account_number' => '112233a',
                 'routing_number' => '121042882',
                 'type' => 'checking',
             ),
             'something sour');
     }
 
     function testCreateCallback() {
         $callback = self::$marketplace->createCallback(
             'http://example.com/php'
         );
         $this->assertEquals($callback->url, 'http://example.com/php');
     }
 
     /**
      * @expectedException \Balanced\Errors\BankAccountVerificationFailure
      */
     function testBankAccountVerificationFailure() {
         $bank_account = self::_createBankAccount();
         $buyer = self::_createBuyer();
         $buyer->addBankAccount($bank_account);
         $verification = $bank_account->verify();
         $verification->confirm(1, 2);
     }
 
     /**
      * @expectedException \Balanced\Errors\BankAccountVerificationFailure
      */
     function testBankAccountVerificationDuplicate() {
         $bank_account = self::_createBankAccount();
         $buyer = self::_createBuyer();
         $buyer->addBankAccount($bank_account);
         $bank_account->verify();
         $bank_account->verify();
     }
 
     function testBankAccountVerificationSuccess() {
         $bank_account = self::_createBankAccount();
         $buyer = self::_createBuyer();
         $buyer->addBankAccount($bank_account);
         $verification = $bank_account->verify();
         $verification->confirm(1, 1);
 
         //  this will fail if the bank account is not verified
         $debit = $buyer->debit(
             1000,
             'Softie',
             'something i bought',
             array('hi' => 'bye'),
             $bank_account
         );
         $this->assertTrue(strpos($debit->source->uri, 'bank_account') > 0);
     }
 
     function testEvents() {
-        $prev_num_events = Marketplace::mine()->events->total();
-        $account = self::_createBuyer();
-        $account->debit(123);
-        $cur_num_events = Marketplace::mine()->events->total();
-        $count = 0;
+        $prev_num_events = Marketplace::mine()->events->total();
+        $account = self::_createBuyer();
+        $account->debit(123);
+        $cur_num_events = Marketplace::mine()->events->total();
+        $count = 0;
         while ($cur_num_events == $prev_num_events && $count < 10) {
             printf("waiting for events - %d, %d == %d\n", $count + 1, $cur_num_events, $prev_num_events);
             sleep(2); // 2 seconds
-            $cur_num_events = Marketplace::mine()->events->total();
-            $count += 1;
-        }
+            $cur_num_events = Marketplace::mine()->events->total();
+            $count += 1;
+        }
         $this->assertTrue($cur_num_events > $prev_num_events);
     }
 }
diff --git a/src/aphront/AphrontController.php b/src/aphront/AphrontController.php
index a591271270..352e56ee11 100644
--- a/src/aphront/AphrontController.php
+++ b/src/aphront/AphrontController.php
@@ -1,86 +1,83 @@
 <?php
 
-/**
- * @group aphront
- */
 abstract class AphrontController extends Phobject {
 
   private $request;
   private $currentApplication;
   private $delegatingController;
 
   public function setDelegatingController(
     AphrontController $delegating_controller) {
     $this->delegatingController = $delegating_controller;
     return $this;
   }
 
   public function getDelegatingController() {
     return $this->delegatingController;
   }
 
   public function willBeginExecution() {
     return;
   }
 
   public function willProcessRequest(array $uri_data) {
     return;
   }
 
   public function didProcessRequest($response) {
     return $response;
   }
 
   abstract public function processRequest();
 
   final public function __construct(AphrontRequest $request) {
     $this->request = $request;
   }
 
   final public function getRequest() {
     return $this->request;
   }
 
   final public function delegateToController(AphrontController $controller) {
     $controller->setDelegatingController($this);
 
     $application = $this->getCurrentApplication();
     if ($application) {
       $controller->setCurrentApplication($application);
     }
 
     return $controller->processRequest();
   }
 
   final public function setCurrentApplication(
     PhabricatorApplication $current_application) {
 
     $this->currentApplication = $current_application;
     return $this;
   }
 
   final public function getCurrentApplication() {
     return $this->currentApplication;
   }
 
   public function getDefaultResourceSource() {
     throw new Exception(
       pht(
         'A Controller must implement getDefaultResourceSource() before you '.
         'can invoke requireResource() or initBehavior().'));
   }
 
   public function requireResource($symbol) {
     $response = CelerityAPI::getStaticResourceResponse();
     $response->requireResource($symbol, $this->getDefaultResourceSource());
     return $this;
   }
 
   public function initBehavior($name, $config = array()) {
     Javelin::initBehavior(
       $name,
       $config,
       $this->getDefaultResourceSource());
   }
 
 }
diff --git a/src/aphront/AphrontURIMapper.php b/src/aphront/AphrontURIMapper.php
index 20ae87db97..9c68f2485f 100644
--- a/src/aphront/AphrontURIMapper.php
+++ b/src/aphront/AphrontURIMapper.php
@@ -1,52 +1,50 @@
 <?php
 
-/**
- * @group aphront
- */
 final class AphrontURIMapper {
 
   private $map;
 
   final public function __construct(array $map) {
     $this->map = $map;
   }
 
   final public function mapPath($path) {
     $map = $this->map;
     foreach ($map as $rule => $value) {
       list($controller, $data) = $this->tryRule($rule, $value, $path);
       if ($controller) {
         foreach ($data as $k => $v) {
           if (is_numeric($k)) {
             unset($data[$k]);
           }
         }
         return array($controller, $data);
       }
     }
 
     return array(null, null);
   }
 
   final private function tryRule($rule, $value, $path) {
     $match = null;
     $pattern = '#^'.$rule.(is_array($value) ? '' : '$').'#';
     if (!preg_match($pattern, $path, $match)) {
       return array(null, null);
     }
 
     if (!is_array($value)) {
       return array($value, $match);
     }
 
     $path = substr($path, strlen($match[0]));
     foreach ($value as $srule => $sval) {
       list($controller, $data) = $this->tryRule($srule, $sval, $path);
       if ($controller) {
         return array($controller, $data + $match);
       }
     }
 
     return array(null, null);
   }
+
 }
diff --git a/src/aphront/configuration/AphrontApplicationConfiguration.php b/src/aphront/configuration/AphrontApplicationConfiguration.php
index b15908c2f1..4141bb005d 100644
--- a/src/aphront/configuration/AphrontApplicationConfiguration.php
+++ b/src/aphront/configuration/AphrontApplicationConfiguration.php
@@ -1,231 +1,231 @@
 <?php
 
 /**
  * @task  routing URI Routing
- * @group aphront
  */
 abstract class AphrontApplicationConfiguration {
 
   private $request;
   private $host;
   private $path;
   private $console;
 
   abstract public function getApplicationName();
   abstract public function getURIMap();
   abstract public function buildRequest();
   abstract public function build404Controller();
   abstract public function buildRedirectController($uri);
 
   final public function setRequest(AphrontRequest $request) {
     $this->request = $request;
     return $this;
   }
 
   final public function getRequest() {
     return $this->request;
   }
 
   final public function getConsole() {
     return $this->console;
   }
 
   final public function setConsole($console) {
     $this->console = $console;
     return $this;
   }
 
   final public function setHost($host) {
     $this->host = $host;
     return $this;
   }
 
   final public function getHost() {
     return $this->host;
   }
 
   final public function setPath($path) {
     $this->path = $path;
     return $this;
   }
 
   final public function getPath() {
     return $this->path;
   }
 
   public function willBuildRequest() {
   }
 
 
 /* -(  URI Routing  )-------------------------------------------------------- */
 
 
   /**
    * Using builtin and application routes, build the appropriate
    * @{class:AphrontController} class for the request. To route a request, we
    * first test if the HTTP_HOST is configured as a valid Phabricator URI. If
    * it isn't, we do a special check to see if it's a custom domain for a blog
    * in the Phame application and if that fails we error. Otherwise, we test
    * the URI against all builtin routes from @{method:getURIMap}, then against
    * all application routes from installed @{class:PhabricatorApplication}s.
    *
    * If we match a route, we construct the controller it points at, build it,
    * and return it.
    *
    * If we fail to match a route, but the current path is missing a trailing
    * "/", we try routing the same path with a trailing "/" and do a redirect
    * if that has a valid route. The idea is to canoncalize URIs for consistency,
    * but avoid breaking noncanonical URIs that we can easily salvage.
    *
    * NOTE: We only redirect on GET. On POST, we'd drop parameters and most
    * likely mutate the request implicitly, and a bad POST usually indicates a
    * programming error rather than a sloppy typist.
    *
    * If the failing path already has a trailing "/", or we can't route the
    * version with a "/", we call @{method:build404Controller}, which build a
    * fallback @{class:AphrontController}.
    *
    * @return pair<AphrontController,dict> Controller and dictionary of request
    *                                      parameters.
    * @task routing
    */
   final public function buildController() {
     $request = $this->getRequest();
 
     if (PhabricatorEnv::getEnvConfig('security.require-https')) {
       if (!$request->isHTTPS()) {
         $https_uri = $request->getRequestURI();
         $https_uri->setDomain($request->getHost());
         $https_uri->setProtocol('https');
         return $this->buildRedirectController($https_uri);
       }
     }
 
     $path         = $request->getPath();
     $host         = $request->getHost();
     $base_uri     = PhabricatorEnv::getEnvConfig('phabricator.base-uri');
     $prod_uri     = PhabricatorEnv::getEnvConfig('phabricator.production-uri');
     $file_uri     = PhabricatorEnv::getEnvConfig(
       'security.alternate-file-domain');
     $conduit_uris = PhabricatorEnv::getEnvConfig('conduit.servers');
     $allowed_uris = PhabricatorEnv::getEnvConfig('phabricator.allowed-uris');
 
     $uris = array_merge(
       array(
         $base_uri,
         $prod_uri,
         $file_uri,
       ),
       $conduit_uris,
       $allowed_uris);
 
     $host_match = false;
     foreach ($uris as $uri) {
       if ($host === id(new PhutilURI($uri))->getDomain()) {
         $host_match = true;
         break;
       }
     }
 
     // NOTE: If the base URI isn't defined yet, don't activate alternate
     // domains.
     if ($base_uri && !$host_match) {
 
       try {
         $blog = id(new PhameBlogQuery())
           ->setViewer(new PhabricatorUser())
           ->withDomain($host)
           ->executeOne();
       } catch (PhabricatorPolicyException $ex) {
         throw new Exception(
           'This blog is not visible to logged out users, so it can not be '.
           'visited from a custom domain.');
       }
 
       if (!$blog) {
         if ($prod_uri && $prod_uri != $base_uri) {
           $prod_str = ' or '.$prod_uri;
         } else {
           $prod_str = '';
         }
         throw new Exception(
           'Specified domain '.$host.' is not configured for Phabricator '.
           'requests. Please use '.$base_uri.$prod_str.' to visit this instance.'
         );
       }
 
       // TODO: Make this more flexible and modular so any application can
       // do crazy stuff here if it wants.
 
       $path = '/phame/live/'.$blog->getID().'/'.$path;
     }
 
     list($controller, $uri_data) = $this->buildControllerForPath($path);
     if (!$controller) {
       if (!preg_match('@/$@', $path)) {
         // If we failed to match anything but don't have a trailing slash, try
         // to add a trailing slash and issue a redirect if that resolves.
         list($controller, $uri_data) = $this->buildControllerForPath($path.'/');
 
         // NOTE: For POST, just 404 instead of redirecting, since the redirect
         // will be a GET without parameters.
 
         if ($controller && !$request->isHTTPPost()) {
           $slash_uri = $request->getRequestURI()->setPath($path.'/');
           return $this->buildRedirectController($slash_uri);
         }
       }
       return $this->build404Controller();
     }
 
     return array($controller, $uri_data);
   }
 
 
   /**
    * Map a specific path to the corresponding controller. For a description
    * of routing, see @{method:buildController}.
    *
    * @return pair<AphrontController,dict> Controller and dictionary of request
    *                                      parameters.
    * @task routing
    */
   final public function buildControllerForPath($path) {
     $maps = array();
     $maps[] = array(null, $this->getURIMap());
 
     $applications = PhabricatorApplication::getAllInstalledApplications();
     foreach ($applications as $application) {
       $maps[] = array($application, $application->getRoutes());
     }
 
     $current_application = null;
     $controller_class = null;
     foreach ($maps as $map_info) {
       list($application, $map) = $map_info;
 
       $mapper = new AphrontURIMapper($map);
       list($controller_class, $uri_data) = $mapper->mapPath($path);
 
       if ($controller_class) {
         if ($application) {
           $current_application = $application;
         }
         break;
       }
     }
 
     if (!$controller_class) {
       return array(null, null);
     }
 
     $request = $this->getRequest();
 
     $controller = newv($controller_class, array($request));
     if ($current_application) {
       $controller->setCurrentApplication($current_application);
     }
 
     return array($controller, $uri_data);
   }
+
 }
diff --git a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
index 05850cb468..895db41e5c 100644
--- a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
+++ b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
@@ -1,316 +1,315 @@
 <?php
 
 /**
  * NOTE: Do not extend this!
  *
  * @concrete-extensible
- * @group aphront
  */
 class AphrontDefaultApplicationConfiguration
   extends AphrontApplicationConfiguration {
 
   public function __construct() {
 
   }
 
   public function getApplicationName() {
     return 'aphront-default';
   }
 
   public function getURIMap() {
     return $this->getResourceURIMapRules() + array(
       '/~/' => array(
         '' => 'DarkConsoleController',
         'data/(?P<key>[^/]+)/' => 'DarkConsoleDataController',
       ),
     );
   }
 
   protected function getResourceURIMapRules() {
     $extensions = CelerityResourceController::getSupportedResourceTypes();
     $extensions = array_keys($extensions);
     $extensions = implode('|', $extensions);
 
     return array(
       '/res/' => array(
         '(?:(?P<mtime>[0-9]+)T/)?'.
         '(?P<library>[^/]+)/'.
         '(?P<hash>[a-f0-9]{8})/'.
         '(?P<path>.+\.(?:'.$extensions.'))'
           => 'CelerityPhabricatorResourceController',
       ),
     );
   }
 
   /**
    * @phutil-external-symbol class PhabricatorStartup
    */
   public function buildRequest() {
     $parser = new PhutilQueryStringParser();
     $data   = array();
 
     // If the request has "multipart/form-data" content, we can't use
     // PhutilQueryStringParser to parse it, and the raw data supposedly is not
     // available anyway (according to the PHP documentation, "php://input" is
     // not available for "multipart/form-data" requests). However, it is
     // available at least some of the time (see T3673), so double check that
     // we aren't trying to parse data we won't be able to parse correctly by
     // examining the Content-Type header.
     $content_type = idx($_SERVER, 'CONTENT_TYPE');
     $is_form_data = preg_match('@^multipart/form-data@i', $content_type);
 
     $raw_input = PhabricatorStartup::getRawInput();
     if (strlen($raw_input) && !$is_form_data) {
       $data += $parser->parseQueryString($raw_input);
     } else if ($_POST) {
       $data += $_POST;
     }
 
     $data += $parser->parseQueryString(idx($_SERVER, 'QUERY_STRING', ''));
 
     $cookie_prefix = PhabricatorEnv::getEnvConfig('phabricator.cookie-prefix');
 
     $request = new AphrontRequest($this->getHost(), $this->getPath());
     $request->setRequestData($data);
     $request->setApplicationConfiguration($this);
     $request->setCookiePrefix($cookie_prefix);
 
     return $request;
   }
 
   public function handleException(Exception $ex) {
     $request = $this->getRequest();
 
     // For Conduit requests, return a Conduit response.
     if ($request->isConduit()) {
       $response = new ConduitAPIResponse();
       $response->setErrorCode(get_class($ex));
       $response->setErrorInfo($ex->getMessage());
 
       return id(new AphrontJSONResponse())
         ->setAddJSONShield(false)
         ->setContent($response->toDictionary());
     }
 
     // For non-workflow requests, return a Ajax response.
     if ($request->isAjax() && !$request->isJavelinWorkflow()) {
       // Log these; they don't get shown on the client and can be difficult
       // to debug.
       phlog($ex);
 
       $response = new AphrontAjaxResponse();
       $response->setError(
         array(
           'code' => get_class($ex),
           'info' => $ex->getMessage(),
         ));
       return $response;
     }
 
     $user = $request->getUser();
     if (!$user) {
       // If we hit an exception very early, we won't have a user.
       $user = new PhabricatorUser();
     }
 
     if ($ex instanceof PhabricatorSystemActionRateLimitException) {
       $dialog = id(new AphrontDialogView())
         ->setTitle(pht('Slow Down!'))
         ->setUser($user)
         ->setErrors(array(pht('You are being rate limited.')))
         ->appendParagraph($ex->getMessage())
         ->appendParagraph($ex->getRateExplanation())
         ->addCancelButton('/', pht('Okaaaaaaaaaaaaaay...'));
 
       $response = new AphrontDialogResponse();
       $response->setDialog($dialog);
       return $response;
     }
 
     if ($ex instanceof PhabricatorAuthHighSecurityRequiredException) {
 
       $form = id(new PhabricatorAuthSessionEngine())->renderHighSecurityForm(
         $ex->getFactors(),
         $ex->getFactorValidationResults(),
         $user,
         $request);
 
       $dialog = id(new AphrontDialogView())
         ->setUser($user)
         ->setTitle(pht('Entering High Security'))
         ->setShortTitle(pht('Security Checkpoint'))
         ->setWidth(AphrontDialogView::WIDTH_FORM)
         ->addHiddenInput(AphrontRequest::TYPE_HISEC, true)
         ->setErrors(
           array(
             pht(
               'You are taking an action which requires you to enter '.
               'high security.'),
           ))
         ->appendParagraph(
           pht(
             'High security mode helps protect your account from security '.
             'threats, like session theft or someone messing with your stuff '.
             'while you\'re grabbing a coffee. To enter high security mode, '.
             'confirm your credentials.'))
         ->appendChild($form->buildLayoutView())
         ->appendParagraph(
           pht(
             'Your account will remain in high security mode for a short '.
             'period of time. When you are finished taking sensitive '.
             'actions, you should leave high security.'))
         ->setSubmitURI($request->getPath())
         ->addCancelButton($ex->getCancelURI())
         ->addSubmitButton(pht('Enter High Security'));
 
       foreach ($request->getPassthroughRequestParameters() as $key => $value) {
         $dialog->addHiddenInput($key, $value);
       }
 
       $response = new AphrontDialogResponse();
       $response->setDialog($dialog);
       return $response;
     }
 
     if ($ex instanceof PhabricatorPolicyException) {
 
       if (!$user->isLoggedIn()) {
         // If the user isn't logged in, just give them a login form. This is
         // probably a generally more useful response than a policy dialog that
         // they have to click through to get a login form.
         //
         // Possibly we should add a header here like "you need to login to see
         // the thing you are trying to look at".
         $login_controller = new PhabricatorAuthStartController($request);
 
         $auth_app_class = 'PhabricatorApplicationAuth';
         $auth_app = PhabricatorApplication::getByClass($auth_app_class);
         $login_controller->setCurrentApplication($auth_app);
 
         return $login_controller->processRequest();
       }
 
       $list = $ex->getMoreInfo();
       foreach ($list as $key => $item) {
         $list[$key] = phutil_tag('li', array(), $item);
       }
       if ($list) {
         $list = phutil_tag('ul', array(), $list);
       }
 
       $content = array(
         phutil_tag(
           'div',
           array(
             'class' => 'aphront-policy-rejection',
           ),
           $ex->getRejection()),
         phutil_tag(
           'div',
           array(
             'class' => 'aphront-capability-details',
           ),
           pht('Users with the "%s" capability:', $ex->getCapabilityName())),
         $list,
       );
 
       $dialog = new AphrontDialogView();
       $dialog
         ->setTitle($ex->getTitle())
         ->setClass('aphront-access-dialog')
         ->setUser($user)
         ->appendChild($content);
 
       if ($this->getRequest()->isAjax()) {
         $dialog->addCancelButton('/', pht('Close'));
       } else {
         $dialog->addCancelButton('/', pht('OK'));
       }
 
       $response = new AphrontDialogResponse();
       $response->setDialog($dialog);
       return $response;
     }
 
     if ($ex instanceof AphrontUsageException) {
       $error = new AphrontErrorView();
       $error->setTitle($ex->getTitle());
       $error->appendChild($ex->getMessage());
 
       $view = new PhabricatorStandardPageView();
       $view->setRequest($this->getRequest());
       $view->appendChild($error);
 
       $response = new AphrontWebpageResponse();
       $response->setContent($view->render());
       $response->setHTTPResponseCode(500);
 
       return $response;
     }
 
 
     // Always log the unhandled exception.
     phlog($ex);
 
     $class    = get_class($ex);
     $message  = $ex->getMessage();
 
     if ($ex instanceof AphrontQuerySchemaException) {
       $message .=
         "\n\n".
         "NOTE: This usually indicates that the MySQL schema has not been ".
         "properly upgraded. Run 'bin/storage upgrade' to ensure your ".
         "schema is up to date.";
     }
 
     if (PhabricatorEnv::getEnvConfig('phabricator.developer-mode')) {
       $trace = id(new AphrontStackTraceView())
         ->setUser($user)
         ->setTrace($ex->getTrace());
     } else {
       $trace = null;
     }
 
     $content = phutil_tag(
       'div',
       array('class' => 'aphront-unhandled-exception'),
       array(
         phutil_tag('div', array('class' => 'exception-message'), $message),
         $trace,
       ));
 
     $dialog = new AphrontDialogView();
     $dialog
       ->setTitle('Unhandled Exception ("'.$class.'")')
       ->setClass('aphront-exception-dialog')
       ->setUser($user)
       ->appendChild($content);
 
     if ($this->getRequest()->isAjax()) {
       $dialog->addCancelButton('/', 'Close');
     }
 
     $response = new AphrontDialogResponse();
     $response->setDialog($dialog);
     $response->setHTTPResponseCode(500);
 
     return $response;
   }
 
   public function willSendResponse(AphrontResponse $response) {
     return $response;
   }
 
   public function build404Controller() {
     return array(new Phabricator404Controller($this->getRequest()), array());
   }
 
   public function buildRedirectController($uri) {
     return array(
       new PhabricatorRedirectController($this->getRequest()),
       array(
         'uri' => $uri,
       ));
   }
 
 }
diff --git a/src/aphront/console/DarkConsoleController.php b/src/aphront/console/DarkConsoleController.php
index eef85de76a..3849ee0cb5 100644
--- a/src/aphront/console/DarkConsoleController.php
+++ b/src/aphront/console/DarkConsoleController.php
@@ -1,49 +1,46 @@
 <?php
 
-/**
- * @group console
- */
 final class DarkConsoleController extends PhabricatorController {
 
   protected $op;
   protected $data;
 
   public function shouldRequireLogin() {
     return !PhabricatorEnv::getEnvConfig('darkconsole.always-on');
   }
 
   public function shouldRequireEnabledUser() {
     return !PhabricatorEnv::getEnvConfig('darkconsole.always-on');
   }
 
   public function shouldAllowPartialSessions() {
     return true;
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
     $response = id(new AphrontAjaxResponse())->setDisableConsole(true);
 
     if (!$user->isLoggedIn()) {
       return $response;
     }
 
     $visible = $request->getStr('visible');
     if (strlen($visible)) {
       $user->setConsoleVisible((int)$visible);
       $user->save();
       return $response;
     }
 
     $tab = $request->getStr('tab');
     if (strlen($tab)) {
       $user->setConsoleTab($tab);
       $user->save();
       return $response;
     }
 
     return new Aphront404Response();
   }
 
 }
diff --git a/src/aphront/console/DarkConsoleCore.php b/src/aphront/console/DarkConsoleCore.php
index 3389109ebf..321b681d50 100644
--- a/src/aphront/console/DarkConsoleCore.php
+++ b/src/aphront/console/DarkConsoleCore.php
@@ -1,137 +1,134 @@
 <?php
 
-/**
- * @group console
- */
 final class DarkConsoleCore {
 
   private $plugins = array();
   const STORAGE_VERSION = 1;
 
   public function __construct() {
     $symbols = id(new PhutilSymbolLoader())
       ->setType('class')
       ->setAncestorClass('DarkConsolePlugin')
       ->selectAndLoadSymbols();
 
     foreach ($symbols as $symbol) {
       $plugin = newv($symbol['name'], array());
       if (!$plugin->shouldStartup()) {
         continue;
       }
       $plugin->setConsoleCore($this);
       $plugin->didStartup();
       $this->plugins[$symbol['name']] = $plugin;
     }
   }
 
   public function getPlugins() {
     return $this->plugins;
   }
 
   public function getKey(AphrontRequest $request) {
     $plugins = $this->getPlugins();
 
     foreach ($plugins as $plugin) {
       $plugin->setRequest($request);
       $plugin->willShutdown();
     }
 
     foreach ($plugins as $plugin) {
       $plugin->didShutdown();
     }
 
     foreach ($plugins as $plugin) {
       $plugin->setData($plugin->generateData());
     }
 
     $plugins = msort($plugins, 'getOrderKey');
 
     $key = Filesystem::readRandomCharacters(24);
 
     $tabs = array();
     $data = array();
     foreach ($plugins as $plugin) {
       $class = get_class($plugin);
       $tabs[] = array(
         'class' => $class,
         'name'  => $plugin->getName(),
         'color' => $plugin->getColor(),
       );
       $data[$class] = $this->sanitizeForJSON($plugin->getData());
     }
 
     $storage = array(
       'vers' => self::STORAGE_VERSION,
       'tabs' => $tabs,
       'data' => $data,
       'user' => $request->getUser()
         ? $request->getUser()->getPHID()
         : null,
     );
 
     $cache = new PhabricatorKeyValueDatabaseCache();
     $cache = new PhutilKeyValueCacheProfiler($cache);
     $cache->setProfiler(PhutilServiceProfiler::getInstance());
 
     // This encoding may fail if there are, e.g., database queries which
     // include binary data. It would be a little cleaner to try to strip these,
     // but just do something non-broken here if we end up with unrepresentable
     // data.
     $json = @json_encode($storage);
     if (!$json) {
       $json = '{}';
     }
 
     $cache->setKeys(
       array(
         'darkconsole:'.$key => $json,
       ),
       $ttl = (60 * 60 * 6));
 
     return $key;
   }
 
   public function getColor() {
     foreach ($this->getPlugins() as $plugin) {
       if ($plugin->getColor()) {
         return $plugin->getColor();
       }
     }
   }
 
   public function render(AphrontRequest $request) {
     $user = $request->getUser();
     $visible = $user ? $user->getConsoleVisible() : true;
 
     return javelin_tag(
       'div',
       array(
         'id' => 'darkconsole',
         'class' => 'dark-console',
         'style' => $visible ? '' : 'display: none;',
         'data-console-key' => $this->getKey($request),
         'data-console-color' => $this->getColor(),
       ),
       '');
   }
 
   /**
    * Sometimes, tab data includes binary information (like INSERT queries which
    * write file data into the database). To successfully JSON encode it, we
    * need to convert it to UTF-8.
    */
   private function sanitizeForJSON($data) {
     if (is_object($data)) {
       return '<object:'.get_class($data).'>';
     } else if (is_array($data)) {
       foreach ($data as $key => $value) {
         $data[$key] = $this->sanitizeForJSON($value);
       }
       return $data;
     } else {
       return phutil_utf8ize($data);
     }
   }
 
 }
diff --git a/src/aphront/console/DarkConsoleDataController.php b/src/aphront/console/DarkConsoleDataController.php
index b1df699407..fd5350679d 100644
--- a/src/aphront/console/DarkConsoleDataController.php
+++ b/src/aphront/console/DarkConsoleDataController.php
@@ -1,87 +1,84 @@
 <?php
 
-/**
- * @group console
- */
 final class DarkConsoleDataController extends PhabricatorController {
 
   private $key;
 
   public function shouldRequireLogin() {
     return !PhabricatorEnv::getEnvConfig('darkconsole.always-on');
   }
 
   public function shouldRequireEnabledUser() {
     return !PhabricatorEnv::getEnvConfig('darkconsole.always-on');
   }
 
   public function shouldAllowPartialSessions() {
     return true;
   }
 
   public function willProcessRequest(array $data) {
     $this->key = $data['key'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $cache = new PhabricatorKeyValueDatabaseCache();
     $cache = new PhutilKeyValueCacheProfiler($cache);
     $cache->setProfiler(PhutilServiceProfiler::getInstance());
 
     $result = $cache->getKey('darkconsole:'.$this->key);
     if (!$result) {
       return new Aphront400Response();
     }
 
     $result = json_decode($result, true);
 
     if (!is_array($result)) {
       return new Aphront400Response();
     }
 
     if ($result['vers'] != DarkConsoleCore::STORAGE_VERSION) {
       return new Aphront400Response();
     }
 
     if ($result['user'] != $user->getPHID()) {
       return new Aphront400Response();
     }
 
     $output = array();
     $output['tabs'] = $result['tabs'];
     $output['panel'] = array();
 
     foreach ($result['data'] as $class => $data) {
       try {
         $obj = newv($class, array());
         $obj->setData($data);
         $obj->setRequest($request);
 
         $panel = $obj->renderPanel();
 
         // Because cookie names can now be prefixed, wipe out any cookie value
         // with the session cookie name anywhere in its name.
         $pattern = '('.preg_quote(PhabricatorCookies::COOKIE_SESSION).')';
         foreach ($_COOKIE as $cookie_name => $cookie_value) {
           if (preg_match($pattern, $cookie_name)) {
             $panel = PhutilSafeHTML::applyFunction(
               'str_replace',
               $cookie_value,
               '(session-key)',
               $panel);
           }
         }
 
         $output['panel'][$class] = $panel;
       } catch (Exception $ex) {
         $output['panel'][$class] = 'error';
       }
     }
 
     return id(new AphrontAjaxResponse())->setContent($output);
   }
 
 }
diff --git a/src/aphront/console/plugin/DarkConsoleErrorLogPlugin.php b/src/aphront/console/plugin/DarkConsoleErrorLogPlugin.php
index cf2d2841f2..513f4b9905 100644
--- a/src/aphront/console/plugin/DarkConsoleErrorLogPlugin.php
+++ b/src/aphront/console/plugin/DarkConsoleErrorLogPlugin.php
@@ -1,101 +1,99 @@
 <?php
 
-/**
- * @group console
- */
 final class DarkConsoleErrorLogPlugin extends DarkConsolePlugin {
 
   public function getName() {
     $count = count($this->getData());
     if ($count) {
       return pht('Error Log (%d)', $count);
     }
     return pht('Error Log');
   }
 
   public function getOrder() {
     return 0;
   }
 
   public function getColor() {
     if (count($this->getData())) {
       return '#ff0000';
     }
     return null;
   }
 
   public function getDescription() {
     return pht('Shows errors and warnings.');
   }
 
   public function generateData() {
     return DarkConsoleErrorLogPluginAPI::getErrors();
   }
 
   public function renderPanel() {
     $data = $this->getData();
 
     $rows = array();
     $details = array();
 
     foreach ($data as $index => $row) {
       $file = $row['file'];
       $line = $row['line'];
 
       $tag = phutil_tag(
         'a',
         array(
           'onclick' => jsprintf('show_details(%d)', $index),
         ),
         $row['str'].' at ['.basename($file).':'.$line.']');
       $rows[] = array($tag);
 
       $details[] = hsprintf(
         '<div class="dark-console-panel-error-details" id="row-details-%s">'.
         "%s\nStack trace:\n",
         $index,
         $row['details']);
 
       foreach ($row['trace'] as $key => $entry) {
         $line = '';
         if (isset($entry['class'])) {
           $line .= $entry['class'].'::';
         }
         $line .= idx($entry, 'function', '');
         $href = null;
         if (isset($entry['file'])) {
           $line .= ' called at ['.$entry['file'].':'.$entry['line'].']';
           try {
             $user = $this->getRequest()->getUser();
             $href = $user->loadEditorLink($entry['file'], $entry['line'], '');
           } catch (Exception $ex) {
             // The database can be inaccessible.
           }
         }
 
         $details[] = phutil_tag(
           'a',
           array(
             'href' => $href,
           ),
           $line);
         $details[] = "\n";
       }
 
       $details[] = hsprintf('</div>');
     }
 
     $table = new AphrontTableView($rows);
     $table->setClassName('error-log');
     $table->setHeaders(array('Error'));
     $table->setNoDataString('No errors.');
 
     return phutil_tag(
       'div',
       array(),
       array(
         phutil_tag('div', array(), $table->render()),
         phutil_tag('pre', array('class' => 'PhabricatorMonospaced'), $details),
       ));
   }
+
 }
diff --git a/src/aphront/console/plugin/DarkConsoleEventPlugin.php b/src/aphront/console/plugin/DarkConsoleEventPlugin.php
index bc191e00ea..02dc4e8b78 100644
--- a/src/aphront/console/plugin/DarkConsoleEventPlugin.php
+++ b/src/aphront/console/plugin/DarkConsoleEventPlugin.php
@@ -1,98 +1,95 @@
 <?php
 
-/**
- * @group console
- */
 final class DarkConsoleEventPlugin extends DarkConsolePlugin {
 
   public function getName() {
     return 'Events';
   }
 
   public function getDescription() {
     return 'Information about Phabricator events and event listeners.';
   }
 
   public function generateData() {
-
     $listeners = PhutilEventEngine::getInstance()->getAllListeners();
     foreach ($listeners as $key => $listener) {
       $listeners[$key] = array(
         'id'      => $listener->getListenerID(),
         'class'   => get_class($listener),
       );
     }
 
     $events = DarkConsoleEventPluginAPI::getEvents();
     foreach ($events as $key => $event) {
       $events[$key] = array(
         'type'    => $event->getType(),
         'stopped' => $event->isStopped(),
       );
     }
 
     return array(
       'listeners' => $listeners,
       'events'    => $events,
     );
   }
 
   public function renderPanel() {
     $data = $this->getData();
 
     $out = array();
 
     $out[] = phutil_tag(
       'div',
       array('class' => 'dark-console-panel-header'),
       phutil_tag('h1', array(), pht('Registered Event Listeners')));
 
     $rows = array();
     foreach ($data['listeners'] as $listener) {
       $rows[] = array($listener['id'], $listener['class']);
     }
 
     $table = new AphrontTableView($rows);
     $table->setHeaders(
       array(
         'Internal ID',
         'Listener Class',
       ));
     $table->setColumnClasses(
       array(
         '',
         'wide',
       ));
 
     $out[] = $table->render();
 
     $out[] = phutil_tag(
       'div',
       array('class' => 'dark-console-panel-header'),
       phutil_tag('h1', array(), pht('Event Log')));
 
     $rows = array();
     foreach ($data['events'] as $event) {
       $rows[] = array(
         $event['type'],
         $event['stopped'] ? 'STOPPED' : null,
       );
     }
 
     $table = new AphrontTableView($rows);
     $table->setColumnClasses(
       array(
         'wide',
       ));
     $table->setHeaders(
       array(
         'Event Type',
         'Stopped',
       ));
 
     $out[] = $table->render();
 
 
     return phutil_implode_html("\n", $out);
   }
+
 }
diff --git a/src/aphront/console/plugin/DarkConsolePlugin.php b/src/aphront/console/plugin/DarkConsolePlugin.php
index 20a93199c0..be1eeb846c 100644
--- a/src/aphront/console/plugin/DarkConsolePlugin.php
+++ b/src/aphront/console/plugin/DarkConsolePlugin.php
@@ -1,90 +1,85 @@
 <?php
 
-/**
- * @group console
- */
 abstract class DarkConsolePlugin {
 
   private $data;
   private $request;
   private $core;
 
   abstract public function getName();
   abstract public function getDescription();
   abstract public function renderPanel();
 
-  public function __construct() {
-
-  }
+  public function __construct() {}
 
   public function getColor() {
     return null;
   }
 
   final public function getOrderKey() {
     return sprintf(
       '%09d%s',
       (int)(999999999 * $this->getOrder()),
       $this->getName());
   }
 
   public function getOrder() {
     return 1.0;
   }
 
   public function setConsoleCore(DarkConsoleCore $core) {
     $this->core = $core;
     return $this;
   }
 
   public function getConsoleCore() {
     return $this->core;
   }
 
   public function generateData() {
     return null;
   }
 
   public function setData($data) {
     $this->data = $data;
     return $this;
   }
 
   public function getData() {
     return $this->data;
   }
 
   public function setRequest($request) {
     $this->request = $request;
     return $this;
   }
 
   public function getRequest() {
     return $this->request;
   }
 
   public function getRequestURI() {
     return $this->getRequest()->getRequestURI();
   }
 
   public function shouldStartup() {
     return true;
   }
 
   public function didStartup() {
     return null;
   }
 
   public function willShutdown() {
     return null;
   }
 
   public function didShutdown() {
     return null;
   }
 
   public function processRequest() {
     return null;
   }
 
 }
diff --git a/src/aphront/console/plugin/DarkConsoleRequestPlugin.php b/src/aphront/console/plugin/DarkConsoleRequestPlugin.php
index 5d43f93745..d6d9687883 100644
--- a/src/aphront/console/plugin/DarkConsoleRequestPlugin.php
+++ b/src/aphront/console/plugin/DarkConsoleRequestPlugin.php
@@ -1,78 +1,75 @@
 <?php
 
-/**
- * @group console
- */
 final class DarkConsoleRequestPlugin extends DarkConsolePlugin {
 
   public function getName() {
     return 'Request';
   }
 
   public function getDescription() {
     return 'Information about $_REQUEST and $_SERVER.';
   }
 
   public function generateData() {
     return array(
       'Request'  => $_REQUEST,
       'Server'   => $_SERVER,
     );
   }
 
   public function renderPanel() {
     $data = $this->getData();
 
     $sections = array(
       'Basics' => array(
         'Machine'   => php_uname('n'),
       ),
     );
 
     // NOTE: This may not be present for some SAPIs, like php-fpm.
     if (!empty($data['Server']['SERVER_ADDR'])) {
       $addr = $data['Server']['SERVER_ADDR'];
       $sections['Basics']['Host'] = $addr;
       $sections['Basics']['Hostname'] = @gethostbyaddr($addr);
     }
 
     $sections = array_merge($sections, $data);
 
     $mask = array(
       'HTTP_COOKIE' => true,
       'HTTP_X_PHABRICATOR_CSRF' => true,
     );
 
     $out = array();
     foreach ($sections as $header => $map) {
       $rows = array();
       foreach ($map as $key => $value) {
         if (isset($mask[$key])) {
           $rows[] = array(
             $key,
             phutil_tag('em', array(), '(Masked)'));
         } else {
           $rows[] = array(
             $key,
             (is_array($value) ? json_encode($value) : $value),
           );
         }
       }
 
       $table = new AphrontTableView($rows);
       $table->setHeaders(
         array(
           $header,
           null,
         ));
       $table->setColumnClasses(
         array(
           'header',
           'wide wrap',
         ));
       $out[] = $table->render();
     }
 
     return phutil_implode_html("\n", $out);
   }
 }
diff --git a/src/aphront/console/plugin/DarkConsoleServicesPlugin.php b/src/aphront/console/plugin/DarkConsoleServicesPlugin.php
index e0f760d271..c085815648 100644
--- a/src/aphront/console/plugin/DarkConsoleServicesPlugin.php
+++ b/src/aphront/console/plugin/DarkConsoleServicesPlugin.php
@@ -1,295 +1,291 @@
 <?php
 
-/**
- * @group console
- */
 final class DarkConsoleServicesPlugin extends DarkConsolePlugin {
 
   protected $observations;
 
   public function getName() {
     return 'Services';
   }
 
   public function getDescription() {
     return 'Information about services.';
   }
 
   public static function getQueryAnalyzerHeader() {
     return 'X-Phabricator-QueryAnalyzer';
   }
 
   public static function isQueryAnalyzerRequested() {
     if (!empty($_REQUEST['__analyze__'])) {
       return true;
     }
 
     $header = AphrontRequest::getHTTPHeader(self::getQueryAnalyzerHeader());
     if ($header) {
       return true;
     }
 
     return false;
   }
 
   /**
    * @phutil-external-symbol class PhabricatorStartup
    */
   public function generateData() {
-
     $should_analyze = self::isQueryAnalyzerRequested();
 
     $log = PhutilServiceProfiler::getInstance()->getServiceCallLog();
     foreach ($log as $key => $entry) {
       $config = idx($entry, 'config', array());
       unset($log[$key]['config']);
 
       if (!$should_analyze) {
         $log[$key]['explain'] = array(
           'sev'     => 7,
           'size'    => null,
           'reason'  => 'Disabled',
         );
         // Query analysis is disabled for this request, so don't do any of it.
         continue;
       }
 
       if ($entry['type'] != 'query') {
         continue;
       }
 
       // For each SELECT query, go issue an EXPLAIN on it so we can flag stuff
       // causing table scans, etc.
       if (preg_match('/^\s*SELECT\b/i', $entry['query'])) {
         $conn = PhabricatorEnv::newObjectFromConfig(
           'mysql.implementation',
           array($entry['config']));
         try {
           $explain = queryfx_all(
             $conn,
             'EXPLAIN %Q',
             $entry['query']);
 
           $badness = 0;
           $size    = 1;
           $reason  = null;
 
           foreach ($explain as $table) {
             $size *= (int)$table['rows'];
 
             switch ($table['type']) {
               case 'index':
                 $cur_badness = 1;
                 $cur_reason  = 'Index';
                 break;
               case 'const':
                 $cur_badness = 1;
                 $cur_reason = 'Const';
                 break;
               case 'eq_ref';
                 $cur_badness = 2;
                 $cur_reason = 'EqRef';
                 break;
               case 'range':
                 $cur_badness = 3;
                 $cur_reason = 'Range';
                 break;
               case 'ref':
                 $cur_badness = 3;
                 $cur_reason = 'Ref';
                 break;
               case 'fulltext':
                 $cur_badness = 3;
                 $cur_reason = 'Fulltext';
                 break;
               case 'ALL':
                 if (preg_match('/Using where/', $table['Extra'])) {
                   if ($table['rows'] < 256 && !empty($table['possible_keys'])) {
                     $cur_badness = 2;
                     $cur_reason = 'Small Table Scan';
                   } else {
                     $cur_badness = 6;
                     $cur_reason = 'TABLE SCAN!';
                   }
                 } else {
                   $cur_badness = 3;
                   $cur_reason = 'Whole Table';
                 }
                 break;
               default:
                 if (preg_match('/No tables used/i', $table['Extra'])) {
                   $cur_badness = 1;
                   $cur_reason = 'No Tables';
                 } else if (preg_match('/Impossible/i', $table['Extra'])) {
                   $cur_badness = 1;
                   $cur_reason = 'Empty';
                 } else {
                   $cur_badness = 4;
                   $cur_reason = "Can't Analyze";
                 }
                 break;
             }
 
             if ($cur_badness > $badness) {
               $badness = $cur_badness;
               $reason = $cur_reason;
             }
           }
 
           $log[$key]['explain'] = array(
             'sev'     => $badness,
             'size'    => $size,
             'reason'  => $reason,
           );
         } catch (Exception $ex) {
           $log[$key]['explain'] = array(
             'sev'     => 5,
             'size'    => null,
             'reason'  => $ex->getMessage(),
           );
         }
       }
     }
 
     return array(
       'start' => PhabricatorStartup::getStartTime(),
       'end'   => microtime(true),
       'log'   => $log,
       'analyzeURI' => (string)$this
         ->getRequestURI()
         ->alter('__analyze__', true),
       'didAnalyze' => $should_analyze,
     );
   }
 
   public function renderPanel() {
     $data = $this->getData();
 
     $log = $data['log'];
     $results = array();
 
     $results[] = phutil_tag(
       'div',
       array('class' => 'dark-console-panel-header'),
       array(
         phutil_tag(
           'a',
           array(
             'href'  => $data['analyzeURI'],
             'class' => $data['didAnalyze'] ? 'disabled button' : 'green button',
           ),
           pht('Analyze Query Plans')),
         phutil_tag('h1', array(), pht('Calls to External Services')),
         phutil_tag('div', array('style' => 'clear: both;')),
       ));
 
     $page_total = $data['end'] - $data['start'];
     $totals = array();
     $counts = array();
 
     foreach ($log as $row) {
       $totals[$row['type']] = idx($totals, $row['type'], 0) + $row['duration'];
       $counts[$row['type']] = idx($counts, $row['type'], 0) + 1;
     }
     $totals['All Services'] = array_sum($totals);
     $counts['All Services'] = array_sum($counts);
 
     $totals['Entire Page'] = $page_total;
     $counts['Entire Page'] = 0;
 
     $summary = array();
     foreach ($totals as $type => $total) {
       $summary[] = array(
         $type,
         number_format($counts[$type]),
         number_format((int)(1000000 * $totals[$type])).' us',
         sprintf('%.1f%%', 100 * $totals[$type] / $page_total),
       );
     }
     $summary_table = new AphrontTableView($summary);
     $summary_table->setColumnClasses(
       array(
         '',
         'n',
         'n',
         'wide',
       ));
     $summary_table->setHeaders(
       array(
         'Type',
         'Count',
         'Total Cost',
         'Page Weight',
       ));
 
     $results[] = $summary_table->render();
 
     $rows = array();
     foreach ($log as $row) {
 
       $analysis = null;
 
       switch ($row['type']) {
         case 'query':
           $info = $row['query'];
           $info = wordwrap($info, 128, "\n", true);
 
           if (!empty($row['explain'])) {
             $analysis = phutil_tag(
               'span',
               array(
                 'class' => 'explain-sev-'.$row['explain']['sev'],
               ),
               $row['explain']['reason']);
           }
 
           break;
         case 'connect':
           $info = $row['host'].':'.$row['database'];
           break;
         case 'exec':
           $info = $row['command'];
           break;
         case 'conduit':
           $info = $row['method'];
           break;
         case 'http':
           $info = $row['uri'];
           break;
         default:
           $info = '-';
           break;
       }
 
       $rows[] = array(
         $row['type'],
         '+'.number_format(1000 * ($row['begin'] - $data['start'])).' ms',
         number_format(1000000 * $row['duration']).' us',
         $info,
         $analysis,
       );
     }
 
     $table = new AphrontTableView($rows);
     $table->setColumnClasses(
       array(
         null,
         'n',
         'n',
         'wide',
         '',
       ));
     $table->setHeaders(
       array(
         'Event',
         'Start',
         'Duration',
         'Details',
         'Analysis',
       ));
 
     $results[] = $table->render();
 
     return phutil_implode_html("\n", $results);
   }
 }
diff --git a/src/aphront/console/plugin/DarkConsoleXHProfPlugin.php b/src/aphront/console/plugin/DarkConsoleXHProfPlugin.php
index f56ad00b9a..2a0d22f775 100644
--- a/src/aphront/console/plugin/DarkConsoleXHProfPlugin.php
+++ b/src/aphront/console/plugin/DarkConsoleXHProfPlugin.php
@@ -1,110 +1,107 @@
 <?php
 
-/**
- * @group console
- */
 final class DarkConsoleXHProfPlugin extends DarkConsolePlugin {
 
   protected $profileFilePHID;
 
   public function getName() {
     return 'XHProf';
   }
 
   public function getColor() {
     $data = $this->getData();
     if ($data['profileFilePHID']) {
       return '#ff00ff';
     }
     return null;
   }
 
   public function getDescription() {
     return 'Provides detailed PHP profiling information through XHProf.';
   }
 
   public function generateData() {
     return array(
       'profileFilePHID' => $this->profileFilePHID,
       'profileURI' => (string)$this
         ->getRequestURI()
         ->alter('__profile__', 'page'),
     );
   }
 
   public function getXHProfRunID() {
     return $this->profileFilePHID;
   }
 
   public function renderPanel() {
     $data = $this->getData();
 
     $run = $data['profileFilePHID'];
     $profile_uri = $data['profileURI'];
 
     if (!DarkConsoleXHProfPluginAPI::isProfilerAvailable()) {
       $href = PhabricatorEnv::getDoclink('Installation Guide');
       $install_guide = phutil_tag(
         'a',
         array(
           'href' => $href,
           'class' => 'bright-link',
         ),
         'Installation Guide');
       return hsprintf(
         '<div class="dark-console-no-content">'.
           'The "xhprof" PHP extension is not available. Install xhprof '.
           'to enable the XHProf console plugin. You can find instructions in '.
           'the %s.'.
         '</div>',
         $install_guide);
     }
 
     $result = array();
 
     $header = phutil_tag(
       'div',
       array('class' => 'dark-console-panel-header'),
       array(
         phutil_tag(
           'a',
           array(
             'href'  => $profile_uri,
             'class' => $run ? 'disabled button' : 'green button',
           ),
           pht('Profile Page')),
         phutil_tag('h1', array(), pht('XHProf Profiler')),
       ));
     $result[] = $header;
 
     if ($run) {
       $result[] = phutil_tag(
         'a',
         array(
           'href' => "/xhprof/profile/$run/",
           'class' => 'bright-link',
           'style' => 'float: right; margin: 1em 2em 0 0; font-weight: bold;',
           'target' => '_blank',
         ),
         pht('Profile Permalink'));
       $result[] = phutil_tag(
         'iframe',
         array('src' => "/xhprof/profile/$run/?frame=true"));
     } else {
       $result[] = phutil_tag(
         'div',
         array('class' => 'dark-console-no-content'),
         pht(
           'Profiling was not enabled for this page. Use the button above '.
           'to enable it.'));
     }
 
     return phutil_implode_html("\n", $result);
   }
 
 
   public function willShutdown() {
     $this->profileFilePHID = DarkConsoleXHProfPluginAPI::getProfileFilePHID();
   }
 
 }
diff --git a/src/aphront/console/plugin/errorlog/DarkConsoleErrorLogPluginAPI.php b/src/aphront/console/plugin/errorlog/DarkConsoleErrorLogPluginAPI.php
index c65a4a27b8..0708c98eec 100644
--- a/src/aphront/console/plugin/errorlog/DarkConsoleErrorLogPluginAPI.php
+++ b/src/aphront/console/plugin/errorlog/DarkConsoleErrorLogPluginAPI.php
@@ -1,78 +1,75 @@
 <?php
 
-/**
- * @group console
- */
 final class DarkConsoleErrorLogPluginAPI {
 
   private static $errors = array();
 
   private static $discardMode = false;
 
   public static function registerErrorHandler() {
     // NOTE: This forces PhutilReadableSerializer to load, so that we are
     // able to handle errors which fire from inside autoloaders (PHP will not
     // reenter autoloaders).
     PhutilReadableSerializer::printableValue(null);
     PhutilErrorHandler::setErrorListener(
       array('DarkConsoleErrorLogPluginAPI', 'handleErrors'));
   }
 
   public static function enableDiscardMode() {
     self::$discardMode = true;
   }
 
   public static function disableDiscardMode() {
     self::$discardMode = false;
   }
 
   public static function getErrors() {
     return self::$errors;
   }
 
   public static function handleErrors($event, $value, $metadata) {
     if (self::$discardMode) {
       return;
     }
 
     switch ($event) {
       case PhutilErrorHandler::EXCEPTION:
         // $value is of type Exception
         self::$errors[] = array(
           'details'   => $value->getMessage(),
           'event'     => $event,
           'file'      => $value->getFile(),
           'line'      => $value->getLine(),
           'str'       => $value->getMessage(),
           'trace'     => $metadata['trace'],
         );
         break;
       case PhutilErrorHandler::ERROR:
         // $value is a simple string
         self::$errors[] = array(
           'details'   => $value,
           'event'     => $event,
           'file'      => $metadata['file'],
           'line'      => $metadata['line'],
           'str'       => $value,
           'trace'     => $metadata['trace'],
         );
         break;
       case PhutilErrorHandler::PHLOG:
         // $value can be anything
         self::$errors[] = array(
           'details' => PhutilReadableSerializer::printShallow($value, 3),
           'event'   => $event,
           'file'    => $metadata['file'],
           'line'    => $metadata['line'],
           'str'     => PhutilReadableSerializer::printShort($value),
           'trace'   => $metadata['trace'],
         );
         break;
       default:
         error_log('Unknown event : '.$event);
         break;
     }
   }
 
 }
diff --git a/src/aphront/console/plugin/event/DarkConsoleEventPluginAPI.php b/src/aphront/console/plugin/event/DarkConsoleEventPluginAPI.php
index afac58ceb4..08db894e4e 100644
--- a/src/aphront/console/plugin/event/DarkConsoleEventPluginAPI.php
+++ b/src/aphront/console/plugin/event/DarkConsoleEventPluginAPI.php
@@ -1,30 +1,27 @@
 <?php
 
-/**
- * @group console
- */
 final class DarkConsoleEventPluginAPI extends PhabricatorEventListener {
 
   private static $events = array();
   private static $discardMode = false;
 
   public static function enableDiscardMode() {
     self::$discardMode = true;
   }
 
   public static function getEvents() {
     return self::$events;
   }
 
   public function register() {
     $this->listen(PhabricatorEventType::TYPE_ALL);
   }
 
   public function handleEvent(PhutilEvent $event) {
     if (self::$discardMode) {
       return;
     }
     self::$events[] = $event;
   }
 
 }
diff --git a/src/aphront/console/plugin/xhprof/DarkConsoleXHProfPluginAPI.php b/src/aphront/console/plugin/xhprof/DarkConsoleXHProfPluginAPI.php
index d14f6b535e..a89c5a37b8 100644
--- a/src/aphront/console/plugin/xhprof/DarkConsoleXHProfPluginAPI.php
+++ b/src/aphront/console/plugin/xhprof/DarkConsoleXHProfPluginAPI.php
@@ -1,187 +1,186 @@
 <?php
 
 /**
- * @group console
  * @phutil-external-symbol function xhprof_enable
  * @phutil-external-symbol function xhprof_disable
  */
 final class DarkConsoleXHProfPluginAPI {
 
   private static $profilerStarted;
   private static $profilerRunning;
   private static $profileFilePHID;
 
   public static function isProfilerAvailable() {
     return extension_loaded('xhprof');
   }
 
   public static function getProfilerHeader() {
     return 'X-Phabricator-Profiler';
   }
 
   public static function isProfilerRequested() {
     if (!empty($_REQUEST['__profile__'])) {
       return $_REQUEST['__profile__'];
     }
 
     $header = AphrontRequest::getHTTPHeader(self::getProfilerHeader());
     if ($header) {
       return $header;
     }
 
     return false;
   }
 
   private static function shouldStartProfiler() {
     if (self::isProfilerRequested()) {
       return true;
     }
 
     static $sample_request = null;
 
     if ($sample_request === null) {
       if (PhabricatorEnv::getEnvConfig('debug.profile-rate')) {
         $rate = PhabricatorEnv::getEnvConfig('debug.profile-rate');
         if (mt_rand(1, $rate) == 1) {
           $sample_request = true;
         } else {
           $sample_request = false;
         }
       }
     }
 
     return $sample_request;
   }
 
   public static function isProfilerStarted() {
     return self::$profilerStarted;
   }
 
   private static function isProfilerRunning() {
     return self::$profilerRunning;
   }
 
   public static function includeXHProfLib() {
     // TODO: this is incredibly stupid, but we may not have Phutil metamodule
     // stuff loaded yet so we can't just phutil_get_library_root() our way
     // to victory.
     $root = __FILE__;
     for ($ii = 0; $ii < 6; $ii++) {
       $root = dirname($root);
     }
 
     require_once $root.'/externals/xhprof/xhprof_lib.php';
   }
 
 
   public static function saveProfilerSample(PhutilDeferredLog $access_log) {
     $file_phid = self::getProfileFilePHID();
     if (!$file_phid) {
       return;
     }
 
     if (self::isProfilerRequested()) {
       $sample_rate = 0;
     } else {
       $sample_rate = PhabricatorEnv::getEnvConfig('debug.profile-rate');
     }
 
     $profile_sample = id(new PhabricatorXHProfSample())
       ->setFilePHID($file_phid)
       ->setSampleRate($sample_rate)
       ->setUsTotal($access_log->getData('T'))
       ->setHostname($access_log->getData('h'))
       ->setRequestPath($access_log->getData('U'))
       ->setController($access_log->getData('C'))
       ->setUserPHID($access_log->getData('P'));
 
     AphrontWriteGuard::allowDangerousUnguardedWrites(true);
       $caught = null;
       try {
         $profile_sample->save();
       } catch (Exception $ex) {
         $caught = $ex;
       }
     AphrontWriteGuard::allowDangerousUnguardedWrites(false);
 
     if ($caught) {
       throw $caught;
     }
   }
 
   public static function hookProfiler() {
     if (!self::shouldStartProfiler()) {
       return;
     }
 
     if (!self::isProfilerAvailable()) {
       return;
     }
 
     if (self::$profilerStarted) {
       return;
     }
 
     self::startProfiler();
   }
 
   private static function startProfiler() {
     self::includeXHProfLib();
     xhprof_enable();
 
     self::$profilerStarted = true;
     self::$profilerRunning = true;
   }
 
   public static function getProfileFilePHID() {
     self::stopProfiler();
     return self::$profileFilePHID;
   }
 
   private static function stopProfiler() {
     if (!self::isProfilerRunning()) {
       return;
     }
 
     $data = xhprof_disable();
     $data = @json_encode($data);
     self::$profilerRunning = false;
 
     // Since these happen on GET we can't do guarded writes. These also
     // sometimes happen after we've disposed of the write guard; in this
     // case we need to disable the whole mechanism.
 
     $use_scope = AphrontWriteGuard::isGuardActive();
     if ($use_scope) {
       $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
     } else {
       AphrontWriteGuard::allowDangerousUnguardedWrites(true);
     }
 
     $caught = null;
     try {
       $file = call_user_func(
         array('PhabricatorFile', 'newFromFileData'),
         $data,
         array(
           'mime-type' => 'application/xhprof',
           'name'      => 'profile.xhprof',
         ));
     } catch (Exception $ex) {
       $caught = $ex;
     }
 
     if ($use_scope) {
       unset($unguarded);
     } else {
       AphrontWriteGuard::allowDangerousUnguardedWrites(false);
     }
 
     if ($caught) {
       throw $caught;
     }
 
     self::$profileFilePHID = $file->getPHID();
   }
 
 }
diff --git a/src/aphront/response/Aphront304Response.php b/src/aphront/response/Aphront304Response.php
index 4a1d93c773..bdf1e4f980 100644
--- a/src/aphront/response/Aphront304Response.php
+++ b/src/aphront/response/Aphront304Response.php
@@ -1,19 +1,16 @@
 <?php
 
-/**
- * @group aphront
- */
 final class Aphront304Response extends AphrontResponse {
 
   public function getHTTPResponseCode() {
     return 304;
   }
 
   public function buildResponseString() {
     // IMPORTANT! According to the HTTP/1.1 spec (RFC 2616) a 304 response
     // "MUST NOT" have any content. Apache + Safari strongly agree, and
     // completely flip out and you start getting 304s for no-cache pages.
     return null;
   }
 
 }
diff --git a/src/aphront/response/Aphront400Response.php b/src/aphront/response/Aphront400Response.php
index 92d7167d9d..37da1f849c 100644
--- a/src/aphront/response/Aphront400Response.php
+++ b/src/aphront/response/Aphront400Response.php
@@ -1,16 +1,13 @@
 <?php
 
-/**
- * @group aphront
- */
 final class Aphront400Response extends AphrontResponse {
 
   public function getHTTPResponseCode() {
     return 400;
   }
 
   public function buildResponseString() {
     return '400 Bad Request';
   }
 
 }
diff --git a/src/aphront/response/Aphront403Response.php b/src/aphront/response/Aphront403Response.php
index 33103ae197..8866b0ec0b 100644
--- a/src/aphront/response/Aphront403Response.php
+++ b/src/aphront/response/Aphront403Response.php
@@ -1,39 +1,36 @@
 <?php
 
-/**
- * @group aphront
- */
 final class Aphront403Response extends AphrontHTMLResponse {
 
   private $forbiddenText;
   public function setForbiddenText($text) {
     $this->forbiddenText = $text;
     return $this;
   }
   private function getForbiddenText() {
     return $this->forbiddenText;
   }
 
   public function getHTTPResponseCode() {
     return 403;
   }
 
   public function buildResponseString() {
     $forbidden_text = $this->getForbiddenText();
     if (!$forbidden_text) {
       $forbidden_text =
         'You do not have privileges to access the requested page.';
     }
     $failure = new AphrontRequestFailureView();
     $failure->setHeader('403 Forbidden');
     $failure->appendChild(phutil_tag('p', array(), $forbidden_text));
 
     $view = new PhabricatorStandardPageView();
     $view->setTitle('403 Forbidden');
     $view->setRequest($this->getRequest());
     $view->appendChild($failure);
 
     return $view->render();
   }
 
 }
diff --git a/src/aphront/response/Aphront404Response.php b/src/aphront/response/Aphront404Response.php
index fbfa41a0da..f24ed524a5 100644
--- a/src/aphront/response/Aphront404Response.php
+++ b/src/aphront/response/Aphront404Response.php
@@ -1,26 +1,23 @@
 <?php
 
-/**
- * @group aphront
- */
 final class Aphront404Response extends AphrontHTMLResponse {
 
   public function getHTTPResponseCode() {
     return 404;
   }
 
   public function buildResponseString() {
     $failure = new AphrontRequestFailureView();
     $failure->setHeader('404 Not Found');
     $failure->appendChild(phutil_tag('p', array(), pht(
       'The page you requested was not found.')));
 
     $view = new PhabricatorStandardPageView();
     $view->setTitle('404 Not Found');
     $view->setRequest($this->getRequest());
     $view->appendChild($failure);
 
     return $view->render();
   }
 
 }
diff --git a/src/aphront/response/AphrontAjaxResponse.php b/src/aphront/response/AphrontAjaxResponse.php
index 032f11e120..c37fcb3de9 100644
--- a/src/aphront/response/AphrontAjaxResponse.php
+++ b/src/aphront/response/AphrontAjaxResponse.php
@@ -1,80 +1,77 @@
 <?php
 
-/**
- * @group aphront
- */
 final class AphrontAjaxResponse extends AphrontResponse {
 
   private $content;
   private $error;
   private $disableConsole;
 
   public function setContent($content) {
     $this->content = $content;
     return $this;
   }
 
   public function setError($error) {
     $this->error = $error;
     return $this;
   }
 
   public function setDisableConsole($disable) {
     $this->disableConsole = $disable;
     return $this;
   }
 
   private function getConsole() {
     if ($this->disableConsole) {
       $console = null;
     } else {
       $request = $this->getRequest();
       $console = $request->getApplicationConfiguration()->getConsole();
     }
     return $console;
   }
 
   public function buildResponseString() {
     $console = $this->getConsole();
     if ($console) {
       // NOTE: We're stripping query parameters here both for readability and
       // to mitigate BREACH and similar attacks. The parameters are available
       // in the "Request" tab, so this should not impact usability. See T3684.
       $uri = $this->getRequest()->getRequestURI();
       $uri = new PhutilURI($uri);
       $uri->setQueryParams(array());
 
       Javelin::initBehavior(
         'dark-console',
         array(
           'uri'     => (string)$uri,
           'key'     => $console->getKey($this->getRequest()),
           'color'   => $console->getColor(),
         ));
     }
 
     // Flatten the response first, so we initialize any behaviors and metadata
     // we need to.
     $content = array(
       'payload' => $this->content,
     );
     $this->encodeJSONForHTTPResponse($content);
 
     $response = CelerityAPI::getStaticResourceResponse();
     $object = $response->buildAjaxResponse(
       $content['payload'],
       $this->error);
 
     $response_json = $this->encodeJSONForHTTPResponse($object);
     return $this->addJSONShield($response_json);
   }
 
   public function getHeaders() {
     $headers = array(
       array('Content-Type', 'text/plain; charset=UTF-8'),
     );
     $headers = array_merge(parent::getHeaders(), $headers);
     return $headers;
   }
 
 }
diff --git a/src/aphront/response/AphrontDialogResponse.php b/src/aphront/response/AphrontDialogResponse.php
index 7aa34db8ae..e2db051077 100644
--- a/src/aphront/response/AphrontDialogResponse.php
+++ b/src/aphront/response/AphrontDialogResponse.php
@@ -1,23 +1,20 @@
 <?php
 
-/**
- * @group aphront
- */
 final class AphrontDialogResponse extends AphrontResponse {
 
   private $dialog;
 
   public function setDialog(AphrontDialogView $dialog) {
     $this->dialog = $dialog;
     return $this;
   }
 
   public function getDialog() {
     return $this->dialog;
   }
 
   public function buildResponseString() {
     return $this->dialog->render();
   }
 
 }
diff --git a/src/aphront/response/AphrontFileResponse.php b/src/aphront/response/AphrontFileResponse.php
index 13d980d06e..fae9f8af17 100644
--- a/src/aphront/response/AphrontFileResponse.php
+++ b/src/aphront/response/AphrontFileResponse.php
@@ -1,95 +1,92 @@
 <?php
 
-/**
- * @group aphront
- */
 final class AphrontFileResponse extends AphrontResponse {
 
   private $content;
   private $mimeType;
   private $download;
   private $rangeMin;
   private $rangeMax;
   private $allowOrigins = array();
 
   public function addAllowOrigin($origin) {
     $this->allowOrigins[] = $origin;
     return $this;
   }
 
   public function setDownload($download) {
     $download = preg_replace('/[^A-Za-z0-9_.-]/', '_', $download);
     if (!strlen($download)) {
       $download = 'untitled_document.txt';
     }
     $this->download = $download;
     return $this;
   }
 
   public function getDownload() {
     return $this->download;
   }
 
   public function setMimeType($mime_type) {
     $this->mimeType = $mime_type;
     return $this;
   }
 
   public function getMimeType() {
     return $this->mimeType;
   }
 
   public function setContent($content) {
     $this->content = $content;
     return $this;
   }
 
   public function buildResponseString() {
     if ($this->rangeMin || $this->rangeMax) {
       $length = ($this->rangeMax - $this->rangeMin) + 1;
       return substr($this->content, $this->rangeMin, $length);
     } else {
       return $this->content;
     }
   }
 
   public function setRange($min, $max) {
     $this->rangeMin = $min;
     $this->rangeMax = $max;
     return $this;
   }
 
   public function getHeaders() {
     $headers = array(
       array('Content-Type', $this->getMimeType()),
       array('Content-Length', strlen($this->buildResponseString())),
     );
 
     if ($this->rangeMin || $this->rangeMax) {
       $len = strlen($this->content);
       $min = $this->rangeMin;
       $max = $this->rangeMax;
       $headers[] = array('Content-Range', "bytes {$min}-{$max}/{$len}");
     }
 
     if (strlen($this->getDownload())) {
       $headers[] = array('X-Download-Options', 'noopen');
 
       $filename = $this->getDownload();
       $headers[] = array(
         'Content-Disposition',
         'attachment; filename='.$filename,
       );
     }
 
     if ($this->allowOrigins) {
       $headers[] = array(
         'Access-Control-Allow-Origin',
         implode(',', $this->allowOrigins));
     }
 
     $headers = array_merge(parent::getHeaders(), $headers);
     return $headers;
   }
 
 }
diff --git a/src/aphront/response/AphrontHTMLResponse.php b/src/aphront/response/AphrontHTMLResponse.php
index 4448fcdf12..ae3264d287 100644
--- a/src/aphront/response/AphrontHTMLResponse.php
+++ b/src/aphront/response/AphrontHTMLResponse.php
@@ -1,16 +1,13 @@
 <?php
 
-/**
- * @group aphront
- */
 abstract class AphrontHTMLResponse extends AphrontResponse {
 
   public function getHeaders() {
     $headers = array(
       array('Content-Type', 'text/html; charset=UTF-8'),
     );
     $headers = array_merge(parent::getHeaders(), $headers);
     return $headers;
   }
 
 }
diff --git a/src/aphront/response/AphrontJSONResponse.php b/src/aphront/response/AphrontJSONResponse.php
index f5666db642..a9493a6282 100644
--- a/src/aphront/response/AphrontJSONResponse.php
+++ b/src/aphront/response/AphrontJSONResponse.php
@@ -1,43 +1,41 @@
 <?php
 
-/**
- * @group aphront
- */
 final class AphrontJSONResponse extends AphrontResponse {
 
   private $content;
   private $addJSONShield;
 
   public function setContent($content) {
     $this->content = $content;
     return $this;
   }
 
   public function setAddJSONShield($should_add) {
     $this->addJSONShield = $should_add;
     return $this;
   }
 
   public function shouldAddJSONShield() {
     if ($this->addJSONShield === null) {
       return true;
     }
     return (bool) $this->addJSONShield;
   }
 
   public function buildResponseString() {
     $response = $this->encodeJSONForHTTPResponse($this->content);
     if ($this->shouldAddJSONShield()) {
       $response = $this->addJSONShield($response);
     }
     return $response;
   }
 
   public function getHeaders() {
     $headers = array(
       array('Content-Type', 'application/json'),
     );
     $headers = array_merge(parent::getHeaders(), $headers);
     return $headers;
   }
+
 }
diff --git a/src/aphront/response/AphrontPlainTextResponse.php b/src/aphront/response/AphrontPlainTextResponse.php
index 20ae3b750e..a14b7367e9 100644
--- a/src/aphront/response/AphrontPlainTextResponse.php
+++ b/src/aphront/response/AphrontPlainTextResponse.php
@@ -1,25 +1,22 @@
 <?php
 
-/**
- * @group aphront
- */
 final class AphrontPlainTextResponse extends AphrontResponse {
 
   public function setContent($content) {
     $this->content = $content;
     return $this;
   }
 
   public function buildResponseString() {
     return $this->content;
   }
 
   public function getHeaders() {
     $headers = array(
       array('Content-Type', 'text/plain; charset=utf-8'),
     );
 
     return array_merge(parent::getHeaders(), $headers);
   }
 
 }
diff --git a/src/aphront/response/AphrontProxyResponse.php b/src/aphront/response/AphrontProxyResponse.php
index 36f2830e29..7e27ea2b1b 100644
--- a/src/aphront/response/AphrontProxyResponse.php
+++ b/src/aphront/response/AphrontProxyResponse.php
@@ -1,74 +1,71 @@
 <?php
 
 /**
  * Base class for responses which augment other types of responses. For example,
  * a response might be substantially an Ajax response, but add structure to the
  * response content. It can do this by extending @{class:AphrontProxyResponse},
  * instantiating an @{class:AphrontAjaxResponse} in @{method:buildProxy}, and
  * then constructing a real @{class:AphrontAjaxResponse} in
  * @{method:reduceProxyResponse}.
- *
- * @group aphront
  */
 abstract class AphrontProxyResponse extends AphrontResponse {
 
   private $proxy;
 
   protected function getProxy() {
     if (!$this->proxy) {
       $this->proxy = $this->buildProxy();
     }
     return $this->proxy;
   }
 
   public function setRequest($request) {
     $this->getProxy()->setRequest($request);
     return $this;
   }
 
   public function getRequest() {
     return $this->getProxy()->getRequest();
   }
 
   public function getHeaders() {
     return $this->getProxy()->getHeaders();
   }
 
   public function setCacheDurationInSeconds($duration) {
     $this->getProxy()->setCacheDurationInSeconds($duration);
     return $this;
   }
 
   public function setLastModified($epoch_timestamp) {
     $this->getProxy()->setLastModified($epoch_timestamp);
     return $this;
   }
 
   public function setHTTPResponseCode($code) {
     $this->getProxy()->setHTTPResponseCode($code);
     return $this;
   }
 
   public function getHTTPResponseCode() {
     return $this->getProxy()->getHTTPResponseCode();
   }
 
   public function setFrameable($frameable) {
     $this->getProxy()->setFrameable($frameable);
     return $this;
   }
 
   public function getCacheHeaders() {
     return $this->getProxy()->getCacheHeaders();
   }
 
   abstract protected function buildProxy();
   abstract public function reduceProxyResponse();
 
   final public function buildResponseString() {
     throw new Exception(
       'AphrontProxyResponse must implement reduceProxyResponse().');
   }
 
-
 }
diff --git a/src/aphront/response/AphrontRedirectResponse.php b/src/aphront/response/AphrontRedirectResponse.php
index d94bce6068..3ab88cace9 100644
--- a/src/aphront/response/AphrontRedirectResponse.php
+++ b/src/aphront/response/AphrontRedirectResponse.php
@@ -1,90 +1,88 @@
 <?php
 
 /**
  * TODO: Should be final but isn't because of AphrontReloadResponse.
- *
- * @group aphront
  */
 class AphrontRedirectResponse extends AphrontResponse {
 
   private $uri;
   private $stackWhenCreated;
 
   public function __construct() {
     if ($this->shouldStopForDebugging()) {
       // If we're going to stop, capture the stack so we can print it out.
       $this->stackWhenCreated = id(new Exception())->getTrace();
     }
   }
 
   public function setURI($uri) {
     $this->uri = $uri;
     return $this;
   }
 
   public function getURI() {
     return (string)$this->uri;
   }
 
   public function shouldStopForDebugging() {
     return PhabricatorEnv::getEnvConfig('debug.stop-on-redirect');
   }
 
   public function getHeaders() {
     $headers = array();
     if (!$this->shouldStopForDebugging()) {
       $headers[] = array('Location', $this->uri);
     }
     $headers = array_merge(parent::getHeaders(), $headers);
     return $headers;
   }
 
   public function buildResponseString() {
     if ($this->shouldStopForDebugging()) {
       $request = $this->getRequest();
       $viewer = $request->getUser();
 
       $view = new PhabricatorStandardPageView();
       $view->setRequest($this->getRequest());
       $view->setApplicationName(pht('Debug'));
       $view->setTitle(pht('Stopped on Redirect'));
 
       $dialog = new AphrontDialogView();
       $dialog->setUser($viewer);
       $dialog->setTitle(pht('Stopped on Redirect'));
 
       $dialog->appendParagraph(
         pht(
           'You were stopped here because %s is set in your configuration.',
           phutil_tag('tt', array(), 'debug.stop-on-redirect')));
 
       $dialog->appendParagraph(
         pht(
           'You are being redirected to: %s',
           phutil_tag('tt', array(), $this->getURI())));
 
       $dialog->addCancelButton($this->getURI(), pht('Continue'));
 
       $dialog->appendChild(phutil_tag('br'));
 
       $dialog->appendChild(
         id(new AphrontStackTraceView())
           ->setUser($viewer)
           ->setTrace($this->stackWhenCreated));
 
       $dialog->setIsStandalone(true);
       $dialog->setWidth(AphrontDialogView::WIDTH_FULL);
 
       $box = id(new PHUIBoxView())
         ->addMargin(PHUI::MARGIN_LARGE)
         ->appendChild($dialog);
 
       $view->appendChild($box);
 
       return $view->render();
     }
 
     return '';
   }
 
 }
diff --git a/src/aphront/response/AphrontReloadResponse.php b/src/aphront/response/AphrontReloadResponse.php
index 2b16512620..a95f02963e 100644
--- a/src/aphront/response/AphrontReloadResponse.php
+++ b/src/aphront/response/AphrontReloadResponse.php
@@ -1,21 +1,19 @@
 <?php
 
 /**
  * When actions happen over a JX.Workflow, we may want to reload the page
  * if the action is javascript-driven but redirect if it isn't. This preserves
  * query parameters in the javascript case. A reload response behaves like
  * a redirect response but causes a page reload when received via workflow.
- *
- * @group aphront
  */
 final class AphrontReloadResponse extends AphrontRedirectResponse {
 
   public function getURI() {
     if ($this->getRequest()->isAjax()) {
       return null;
     } else {
       return parent::getURI();
     }
   }
 
 }
diff --git a/src/aphront/response/AphrontResponse.php b/src/aphront/response/AphrontResponse.php
index 67da4aee93..759b03b091 100644
--- a/src/aphront/response/AphrontResponse.php
+++ b/src/aphront/response/AphrontResponse.php
@@ -1,151 +1,147 @@
 <?php
 
-/**
- * @group aphront
- */
 abstract class AphrontResponse {
 
   private $request;
   private $cacheable = false;
   private $responseCode = 200;
   private $lastModified = null;
 
   protected $frameable;
 
   public function setRequest($request) {
     $this->request = $request;
     return $this;
   }
 
   public function getRequest() {
     return $this->request;
   }
 
   public function getHeaders() {
     $headers = array();
     if (!$this->frameable) {
       $headers[] = array('X-Frame-Options', 'Deny');
     }
 
     return $headers;
   }
 
   public function setCacheDurationInSeconds($duration) {
     $this->cacheable = $duration;
     return $this;
   }
 
   public function setLastModified($epoch_timestamp) {
     $this->lastModified = $epoch_timestamp;
     return $this;
   }
 
   public function setHTTPResponseCode($code) {
     $this->responseCode = $code;
     return $this;
   }
 
   public function getHTTPResponseCode() {
     return $this->responseCode;
   }
 
   public function getHTTPResponseMessage() {
     return '';
   }
 
   public function setFrameable($frameable) {
     $this->frameable = $frameable;
     return $this;
   }
 
   public static function processValueForJSONEncoding(&$value, $key) {
     if ($value instanceof PhutilSafeHTMLProducerInterface) {
       // This renders the producer down to PhutilSafeHTML, which will then
       // be simplified into a string below.
       $value = hsprintf('%s', $value);
     }
 
     if ($value instanceof PhutilSafeHTML) {
       // TODO: Javelin supports implicity conversion of '__html' objects to
       // JX.HTML, but only for Ajax responses, not behaviors. Just leave things
       // as they are for now (where behaviors treat responses as HTML or plain
       // text at their discretion).
       $value = $value->getHTMLContent();
     }
   }
 
   public static function encodeJSONForHTTPResponse(array $object) {
 
     array_walk_recursive(
       $object,
       array('AphrontResponse', 'processValueForJSONEncoding'));
 
     $response = json_encode($object);
 
     // Prevent content sniffing attacks by encoding "<" and ">", so browsers
     // won't try to execute the document as HTML even if they ignore
     // Content-Type and X-Content-Type-Options. See T865.
     $response = str_replace(
       array('<', '>'),
       array('\u003c', '\u003e'),
       $response);
 
     return $response;
   }
 
   protected function addJSONShield($json_response) {
-
     // Add a shield to prevent "JSON Hijacking" attacks where an attacker
     // requests a JSON response using a normal <script /> tag and then uses
     // Object.prototype.__defineSetter__() or similar to read response data.
     // This header causes the browser to loop infinitely instead of handing over
     // sensitive data.
 
     $shield = 'for (;;);';
 
     $response = $shield.$json_response;
 
     return $response;
   }
 
   public function getCacheHeaders() {
     $headers = array();
     if ($this->cacheable) {
       $headers[] = array(
         'Expires',
         $this->formatEpochTimestampForHTTPHeader(time() + $this->cacheable));
     } else {
       $headers[] = array(
         'Cache-Control',
         'private, no-cache, no-store, must-revalidate');
       $headers[] = array(
         'Pragma',
         'no-cache');
       $headers[] = array(
         'Expires',
         'Sat, 01 Jan 2000 00:00:00 GMT');
     }
 
     if ($this->lastModified) {
       $headers[] = array(
         'Last-Modified',
         $this->formatEpochTimestampForHTTPHeader($this->lastModified));
     }
 
     // IE has a feature where it may override an explicit Content-Type
     // declaration by inferring a content type. This can be a security risk
     // and we always explicitly transmit the correct Content-Type header, so
     // prevent IE from using inferred content types. This only offers protection
     // on recent versions of IE; IE6/7 and Opera currently ignore this header.
     $headers[] = array('X-Content-Type-Options', 'nosniff');
 
     return $headers;
   }
 
   private function formatEpochTimestampForHTTPHeader($epoch_timestamp) {
     return gmdate('D, d M Y H:i:s', $epoch_timestamp).' GMT';
   }
 
   abstract public function buildResponseString();
 
 }
diff --git a/src/aphront/response/AphrontWebpageResponse.php b/src/aphront/response/AphrontWebpageResponse.php
index 9bc2a54e83..bda0d94244 100644
--- a/src/aphront/response/AphrontWebpageResponse.php
+++ b/src/aphront/response/AphrontWebpageResponse.php
@@ -1,19 +1,16 @@
 <?php
 
-/**
- * @group aphront
- */
 final class AphrontWebpageResponse extends AphrontHTMLResponse {
 
   private $content;
 
   public function setContent($content) {
     $this->content = $content;
     return $this;
   }
 
   public function buildResponseString() {
     return hsprintf('%s', $this->content);
   }
 
 }
diff --git a/src/aphront/sink/AphrontHTTPSink.php b/src/aphront/sink/AphrontHTTPSink.php
index cddca7b658..9c6efca4f6 100644
--- a/src/aphront/sink/AphrontHTTPSink.php
+++ b/src/aphront/sink/AphrontHTTPSink.php
@@ -1,120 +1,119 @@
 <?php
 
 /**
  * Abstract class which wraps some sort of output mechanism for HTTP responses.
  * Normally this is just @{class:AphrontPHPHTTPSink}, which uses "echo" and
  * "header()" to emit responses.
  *
  * Mostly, this class allows us to do install security or metrics hooks in the
  * output pipeline.
  *
  * @task write  Writing Response Components
  * @task emit   Emitting the Response
- *
- * @group aphront
  */
 abstract class AphrontHTTPSink {
 
 
 /* -(  Writing Response Components  )---------------------------------------- */
 
 
   /**
    * Write an HTTP status code to the output.
    *
    * @param int Numeric HTTP status code.
    * @return void
    */
   final public function writeHTTPStatus($code, $message = '') {
     if (!preg_match('/^\d{3}$/', $code)) {
       throw new Exception("Malformed HTTP status code '{$code}'!");
     }
 
     $code = (int)$code;
     $this->emitHTTPStatus($code, $message);
   }
 
 
   /**
    * Write HTTP headers to the output.
    *
    * @param list<pair> List of <name, value> pairs.
    * @return void
    */
   final public function writeHeaders(array $headers) {
     foreach ($headers as $header) {
       if (!is_array($header) || count($header) !== 2) {
         throw new Exception('Malformed header.');
       }
       list($name, $value) = $header;
 
       if (strpos($name, ':') !== false) {
         throw new Exception(
           'Declining to emit response with malformed HTTP header name: '.
           $name);
       }
 
       // Attackers may perform an "HTTP response splitting" attack by making
       // the application emit certain types of headers containing newlines:
       //
       //   http://en.wikipedia.org/wiki/HTTP_response_splitting
       //
       // PHP has built-in protections against HTTP response-splitting, but they
       // are of dubious trustworthiness:
       //
       //   http://news.php.net/php.internals/57655
 
       if (preg_match('/[\r\n\0]/', $name.$value)) {
         throw new Exception(
           "Declining to emit response with unsafe HTTP header: ".
           "<'".$name."', '".$value."'>.");
       }
     }
 
     foreach ($headers as $header) {
       list($name, $value) = $header;
       $this->emitHeader($name, $value);
     }
   }
 
 
   /**
    * Write HTTP body data to the output.
    *
    * @param string Body data.
    * @return void
    */
   final public function writeData($data) {
     $this->emitData($data);
   }
 
 
   /**
    * Write an entire @{class:AphrontResponse} to the output.
    *
    * @param AphrontResponse The response object to write.
    * @return void
    */
   final public function writeResponse(AphrontResponse $response) {
     // Do this first, in case it throws.
     $response_string = $response->buildResponseString();
 
     $all_headers = array_merge(
       $response->getHeaders(),
       $response->getCacheHeaders());
 
     $this->writeHTTPStatus(
       $response->getHTTPResponseCode(),
       $response->getHTTPResponseMessage());
     $this->writeHeaders($all_headers);
     $this->writeData($response_string);
   }
 
 
 /* -(  Emitting the Response  )---------------------------------------------- */
 
 
   abstract protected function emitHTTPStatus($code, $message = '');
   abstract protected function emitHeader($name, $value);
   abstract protected function emitData($data);
+
 }
diff --git a/src/aphront/sink/AphrontIsolatedHTTPSink.php b/src/aphront/sink/AphrontIsolatedHTTPSink.php
index 1f8a48f016..ac49b1f9bc 100644
--- a/src/aphront/sink/AphrontIsolatedHTTPSink.php
+++ b/src/aphront/sink/AphrontIsolatedHTTPSink.php
@@ -1,38 +1,36 @@
 <?php
 
 /**
  * Isolated HTTP sink for testing.
- *
- * @group aphront
  */
 final class AphrontIsolatedHTTPSink extends AphrontHTTPSink {
 
   private $status;
   private $headers;
   private $data;
 
   protected function emitHTTPStatus($code, $message = '') {
     $this->status = $code;
   }
 
   protected function emitHeader($name, $value) {
     $this->headers[] = array($name, $value);
   }
 
   protected function emitData($data) {
     $this->data .= $data;
   }
 
   public function getEmittedHTTPStatus() {
     return $this->status;
   }
 
   public function getEmittedHeaders() {
     return $this->headers;
   }
 
   public function getEmittedData() {
     return $this->data;
   }
 
 }
diff --git a/src/aphront/sink/AphrontPHPHTTPSink.php b/src/aphront/sink/AphrontPHPHTTPSink.php
index f983abac95..f028340fa9 100644
--- a/src/aphront/sink/AphrontPHPHTTPSink.php
+++ b/src/aphront/sink/AphrontPHPHTTPSink.php
@@ -1,28 +1,26 @@
 <?php
 
 /**
  * Concrete HTTP sink which uses "echo" and "header()" to emit data.
- *
- * @group aphront
  */
 final class AphrontPHPHTTPSink extends AphrontHTTPSink {
 
   protected function emitHTTPStatus($code, $message = '') {
     if ($code != 200) {
       $header = "HTTP/1.0 {$code}";
       if (strlen($message)) {
         $header .= " {$message}";
       }
       header($header);
     }
   }
 
   protected function emitHeader($name, $value) {
     header("{$name}: {$value}", $replace = false);
   }
 
   protected function emitData($data) {
     echo $data;
   }
 
 }
diff --git a/src/applications/arcanist/conduit/ConduitAPI_arcanist_Method.php b/src/applications/arcanist/conduit/ConduitAPI_arcanist_Method.php
index 82391e1669..33df727d78 100644
--- a/src/applications/arcanist/conduit/ConduitAPI_arcanist_Method.php
+++ b/src/applications/arcanist/conduit/ConduitAPI_arcanist_Method.php
@@ -1,8 +1,3 @@
 <?php
 
-/**
- * @group conduit
- */
-abstract class ConduitAPI_arcanist_Method extends ConduitAPIMethod {
-
-}
+abstract class ConduitAPI_arcanist_Method extends ConduitAPIMethod {}
diff --git a/src/applications/arcanist/conduit/ConduitAPI_arcanist_projectinfo_Method.php b/src/applications/arcanist/conduit/ConduitAPI_arcanist_projectinfo_Method.php
index c1c815521d..4d84866746 100644
--- a/src/applications/arcanist/conduit/ConduitAPI_arcanist_projectinfo_Method.php
+++ b/src/applications/arcanist/conduit/ConduitAPI_arcanist_projectinfo_Method.php
@@ -1,63 +1,60 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_arcanist_projectinfo_Method
   extends ConduitAPI_arcanist_Method {
 
   public function getMethodDescription() {
     return 'Get information about Arcanist projects.';
   }
 
   public function defineParamTypes() {
     return array(
       'name' => 'required string',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-BAD-ARCANIST-PROJECT' => 'No such project exists.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $name = $request->getValue('name');
 
     $project = id(new PhabricatorRepositoryArcanistProject())->loadOneWhere(
       'name = %s',
       $name);
 
     if (!$project) {
       throw new ConduitException('ERR-BAD-ARCANIST-PROJECT');
     }
 
     $repository = $project->loadRepository();
 
     $repository_phid = null;
     $tracked = false;
     $encoding = null;
     $dictionary = array();
     if ($repository) {
       $repository_phid = $repository->getPHID();
       $tracked = $repository->isTracked();
       $encoding = $repository->getDetail('encoding');
       $dictionary = $repository->toDictionary();
     }
 
     return array(
       'name'            => $project->getName(),
       'phid'            => $project->getPHID(),
       'repositoryPHID'  => $repository_phid,
       'tracked'         => $tracked,
       'encoding'        => $encoding,
       'repository'      => $dictionary,
     );
   }
 
 }
diff --git a/src/applications/audit/conduit/ConduitAPI_audit_Method.php b/src/applications/audit/conduit/ConduitAPI_audit_Method.php
index 1fe6c9fcc9..2fcf86edc5 100644
--- a/src/applications/audit/conduit/ConduitAPI_audit_Method.php
+++ b/src/applications/audit/conduit/ConduitAPI_audit_Method.php
@@ -1,12 +1,9 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class ConduitAPI_audit_Method extends ConduitAPIMethod {
 
   public function getApplication() {
     return PhabricatorApplication::getByClass('PhabricatorApplicationAudit');
   }
 
 }
diff --git a/src/applications/audit/conduit/ConduitAPI_audit_query_Method.php b/src/applications/audit/conduit/ConduitAPI_audit_query_Method.php
index 782da6deb7..af66e7b828 100644
--- a/src/applications/audit/conduit/ConduitAPI_audit_query_Method.php
+++ b/src/applications/audit/conduit/ConduitAPI_audit_query_Method.php
@@ -1,80 +1,76 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_audit_query_Method extends ConduitAPI_audit_Method {
 
   public function getMethodDescription() {
     return 'Query audit requests.';
   }
 
   public function defineParamTypes() {
     $statuses = array(
       'status-any',
       'status-open',
     );
     $status_const = $this->formatStringConstants($statuses);
 
     return array(
       'auditorPHIDs'  => 'optional list<phid>',
       'commitPHIDs'   => 'optional list<phid>',
       'status'        => 'optional '.$status_const.' (default = "status-any")',
       'offset'        => 'optional int',
       'limit'         => 'optional int (default = 100)',
     );
   }
 
   public function defineReturnType() {
     return 'list<dict>';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
 
     $query = id(new DiffusionCommitQuery())
       ->setViewer($request->getUser());
 
     $auditor_phids = $request->getValue('auditorPHIDs', array());
     if ($auditor_phids) {
       $query->withAuditorPHIDs($auditor_phids);
     }
 
     $commit_phids = $request->getValue('commitPHIDs', array());
     if ($commit_phids) {
       $query->withPHIDs($commit_phids);
     }
 
     $status = $request->getValue(
       'status',
       DiffusionCommitQuery::AUDIT_STATUS_ANY);
     $query->withAuditStatus($status);
 
     $query->setOffset($request->getValue('offset', 0));
     $query->setLimit($request->getValue('limit', 100));
 
     $commits = $query->execute();
 
     $results = array();
     foreach ($commits as $commit) {
       $requests = $commit->getAudits();
       foreach ($requests as $request) {
         $results[] = array(
           'id'              => $request->getID(),
           'commitPHID'      => $request->getCommitPHID(),
           'auditorPHID'     => $request->getAuditorPHID(),
           'reasons'         => $request->getAuditReasons(),
           'status'          => $request->getAuditStatus(),
         );
       }
     }
 
     return $results;
   }
 
-
 }
diff --git a/src/applications/base/PhabricatorApplication.php b/src/applications/base/PhabricatorApplication.php
index a7956fb9db..ea8299462d 100644
--- a/src/applications/base/PhabricatorApplication.php
+++ b/src/applications/base/PhabricatorApplication.php
@@ -1,502 +1,500 @@
 <?php
 
 /**
  * @task  info  Application Information
  * @task  ui    UI Integration
  * @task  uri   URI Routing
  * @task  fact  Fact Integration
  * @task  meta  Application Management
- * @group apps
  */
-abstract class PhabricatorApplication
-  implements PhabricatorPolicyInterface {
+abstract class PhabricatorApplication implements PhabricatorPolicyInterface {
 
   const GROUP_CORE            = 'core';
   const GROUP_UTILITIES       = 'util';
   const GROUP_ADMIN           = 'admin';
   const GROUP_DEVELOPER       = 'developer';
 
   public static function getApplicationGroups() {
     return array(
       self::GROUP_CORE          => pht('Core Applications'),
       self::GROUP_UTILITIES     => pht('Utilities'),
       self::GROUP_ADMIN         => pht('Administration'),
       self::GROUP_DEVELOPER     => pht('Developer Tools'),
     );
   }
 
 
 /* -(  Application Information  )-------------------------------------------- */
 
 
   public function getName() {
     return substr(get_class($this), strlen('PhabricatorApplication'));
   }
 
   public function getShortDescription() {
     return $this->getName().' Application';
   }
 
   public function isInstalled() {
     if (!$this->canUninstall()) {
       return true;
     }
 
     $beta = PhabricatorEnv::getEnvConfig('phabricator.show-beta-applications');
     if (!$beta && $this->isBeta()) {
       return false;
     }
 
     $uninstalled = PhabricatorEnv::getEnvConfig(
       'phabricator.uninstalled-applications');
 
     return empty($uninstalled[get_class($this)]);
   }
 
 
   public function isBeta() {
     return false;
   }
 
 
   /**
    * Return `true` if this application should never appear in application lists
    * in the UI. Primarily intended for unit test applications or other
    * pseudo-applications.
    *
    * Few applications should be unlisted. For most applications, use
    * @{method:isLaunchable} to hide them from main launch views instead.
    *
    * @return bool True to remove application from UI lists.
    */
   public function isUnlisted() {
     return false;
   }
 
 
   /**
    * Return `true` if this application is a normal application with a base
    * URI and a web interface.
    *
    * Launchable applications can be pinned to the home page, and show up in the
    * "Launcher" view of the Applications application. Making an application
    * unlauncahble prevents pinning and hides it from this view.
    *
    * Usually, an application should be marked unlaunchable if:
    *
    *   - it is available on every page anyway (like search); or
    *   - it does not have a web interface (like subscriptions); or
    *   - it is still pre-release and being intentionally buried.
    *
    * To hide applications more completely, use @{method:isUnlisted}.
    *
    * @return bool True if the application is launchable.
    */
   public function isLaunchable() {
     return true;
   }
 
 
   /**
    * Return `true` if this application should be pinned by default.
    *
    * Users who have not yet set preferences see a default list of applications.
    *
    * @param PhabricatorUser User viewing the pinned application list.
    * @return bool True if this application should be pinned by default.
    */
   public function isPinnedByDefault(PhabricatorUser $viewer) {
     return false;
   }
 
 
   /**
    * Returns true if an application is first-party (developed by Phacility)
    * and false otherwise.
    *
    * @return bool True if this application is developed by Phacility.
    */
   final public function isFirstParty() {
     $where = id(new ReflectionClass($this))->getFileName();
     $root = phutil_get_library_root('phabricator');
 
     if (!Filesystem::isDescendant($where, $root)) {
       return false;
     }
 
     if (Filesystem::isDescendant($where, $root.'/extensions')) {
       return false;
     }
 
     return true;
   }
 
   public function canUninstall() {
     return true;
   }
 
   public function getPHID() {
     return 'PHID-APPS-'.get_class($this);
   }
 
   public function getTypeaheadURI() {
     return $this->isLaunchable() ? $this->getBaseURI() : null;
   }
 
   public function getBaseURI() {
     return null;
   }
 
   public function getApplicationURI($path = '') {
     return $this->getBaseURI().ltrim($path, '/');
   }
 
   public function getIconURI() {
     return null;
   }
 
   public function getIconName() {
     return 'application';
   }
 
   public function getApplicationOrder() {
     return PHP_INT_MAX;
   }
 
   public function getApplicationGroup() {
     return self::GROUP_CORE;
   }
 
   public function getTitleGlyph() {
     return null;
   }
 
   public function getHelpURI() {
     return null;
   }
 
   public function getOverview() {
     return null;
   }
 
   public function getEventListeners() {
     return array();
   }
 
   public function getRemarkupRules() {
     return array();
   }
 
 
 /* -(  URI Routing  )-------------------------------------------------------- */
 
 
   public function getRoutes() {
     return array();
   }
 
 
 /* -(  Fact Integration  )--------------------------------------------------- */
 
 
   public function getFactObjectsForAnalysis() {
     return array();
   }
 
 
 /* -(  UI Integration  )----------------------------------------------------- */
 
 
   /**
    * Render status elements (like "3 Waiting Reviews") for application list
    * views. These provide a way to alert users to new or pending action items
    * in applications.
    *
    * @param PhabricatorUser Viewing user.
    * @return list<PhabricatorApplicationStatusView> Application status elements.
    * @task ui
    */
   public function loadStatus(PhabricatorUser $user) {
     return array();
   }
 
 
   /**
    * You can provide an optional piece of flavor text for the application. This
    * is currently rendered in application launch views if the application has no
    * status elements.
    *
    * @return string|null Flavor text.
    * @task ui
    */
   public function getFlavorText() {
     return null;
   }
 
 
   /**
    * Build items for the main menu.
    *
    * @param  PhabricatorUser    The viewing user.
    * @param  AphrontController  The current controller. May be null for special
    *                            pages like 404, exception handlers, etc.
    * @return list<PHUIListItemView> List of menu items.
    * @task ui
    */
   public function buildMainMenuItems(
     PhabricatorUser $user,
     PhabricatorController $controller = null) {
     return array();
   }
 
 
   /**
    * Build extra items for the main menu. Generally, this is used to render
    * static dropdowns.
    *
    * @param  PhabricatorUser    The viewing user.
    * @param  AphrontController  The current controller. May be null for special
    *                            pages like 404, exception handlers, etc.
    * @return view               List of menu items.
    * @task ui
    */
   public function buildMainMenuExtraNodes(
     PhabricatorUser $viewer,
     PhabricatorController $controller = null) {
     return array();
   }
 
 
   /**
    * Build items for the "quick create" menu.
    *
    * @param   PhabricatorUser         The viewing user.
    * @return  list<PHUIListItemView>  List of menu items.
    */
   public function getQuickCreateItems(PhabricatorUser $viewer) {
     return array();
   }
 
 
 /* -(  Application Management  )--------------------------------------------- */
 
 
   public static function getByClass($class_name) {
     $selected = null;
     $applications = PhabricatorApplication::getAllApplications();
 
     foreach ($applications as $application) {
       if (get_class($application) == $class_name) {
         $selected = $application;
         break;
       }
     }
 
     if (!$selected) {
       throw new Exception("No application '{$class_name}'!");
     }
 
     return $selected;
   }
 
   public static function getAllApplications() {
     static $applications;
 
     if ($applications === null) {
       $apps = id(new PhutilSymbolLoader())
         ->setAncestorClass(__CLASS__)
         ->loadObjects();
 
       // Reorder the applications into "application order". Notably, this
       // ensures their event handlers register in application order.
       $apps = msort($apps, 'getApplicationOrder');
       $apps = mgroup($apps, 'getApplicationGroup');
 
       $group_order = array_keys(self::getApplicationGroups());
       $apps = array_select_keys($apps, $group_order) + $apps;
 
       $apps = array_mergev($apps);
 
       $applications = $apps;
     }
 
     return $applications;
   }
 
   public static function getAllInstalledApplications() {
     $all_applications = self::getAllApplications();
     $apps = array();
     foreach ($all_applications as $app) {
       if (!$app->isInstalled()) {
         continue;
       }
 
       $apps[] = $app;
     }
 
     return $apps;
   }
 
 
   /**
    * Determine if an application is installed, by application class name.
    *
    * To check if an application is installed //and// available to a particular
    * viewer, user @{method:isClassInstalledForViewer}.
    *
    * @param string  Application class name.
    * @return bool   True if the class is installed.
    * @task meta
    */
   public static function isClassInstalled($class) {
     return self::getByClass($class)->isInstalled();
   }
 
 
   /**
    * Determine if an application is installed and available to a viewer, by
    * application class name.
    *
    * To check if an application is installed at all, use
    * @{method:isClassInstalled}.
    *
    * @param string Application class name.
    * @param PhabricatorUser Viewing user.
    * @return bool True if the class is installed for the viewer.
    * @task meta
    */
   public static function isClassInstalledForViewer(
     $class,
     PhabricatorUser $viewer) {
 
     if (!self::isClassInstalled($class)) {
       return false;
     }
 
     return PhabricatorPolicyFilter::hasCapability(
       $viewer,
       self::getByClass($class),
       PhabricatorPolicyCapability::CAN_VIEW);
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array_merge(
       array(
         PhabricatorPolicyCapability::CAN_VIEW,
         PhabricatorPolicyCapability::CAN_EDIT,
       ),
       array_keys($this->getCustomCapabilities()));
   }
 
   public function getPolicy($capability) {
     $default = $this->getCustomPolicySetting($capability);
     if ($default) {
       return $default;
     }
 
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         return PhabricatorPolicies::getMostOpenPolicy();
       case PhabricatorPolicyCapability::CAN_EDIT:
         return PhabricatorPolicies::POLICY_ADMIN;
       default:
         $spec = $this->getCustomCapabilitySpecification($capability);
         return idx($spec, 'default', PhabricatorPolicies::POLICY_USER);
     }
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return false;
   }
 
   public function describeAutomaticCapability($capability) {
     return null;
   }
 
 
 /* -(  Policies  )----------------------------------------------------------- */
 
   protected function getCustomCapabilities() {
     return array();
   }
 
   private function getCustomPolicySetting($capability) {
     if (!$this->isCapabilityEditable($capability)) {
       return null;
     }
 
     $config = PhabricatorEnv::getEnvConfig('phabricator.application-settings');
 
     $app = idx($config, $this->getPHID());
     if (!$app) {
       return null;
     }
 
     $policy = idx($app, 'policy');
     if (!$policy) {
       return null;
     }
 
     return idx($policy, $capability);
   }
 
 
   private function getCustomCapabilitySpecification($capability) {
     $custom = $this->getCustomCapabilities();
     if (!isset($custom[$capability])) {
       throw new Exception("Unknown capability '{$capability}'!");
     }
     return $custom[$capability];
   }
 
   public function getCapabilityLabel($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         return pht('Can Use Application');
       case PhabricatorPolicyCapability::CAN_EDIT:
         return pht('Can Configure Application');
     }
 
     $capobj = PhabricatorPolicyCapability::getCapabilityByKey($capability);
     if ($capobj) {
       return $capobj->getCapabilityName();
     }
 
     return null;
   }
 
   public function isCapabilityEditable($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         return $this->canUninstall();
       case PhabricatorPolicyCapability::CAN_EDIT:
         return false;
       default:
         $spec = $this->getCustomCapabilitySpecification($capability);
         return idx($spec, 'edit', true);
     }
   }
 
   public function getCapabilityCaption($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         if (!$this->canUninstall()) {
           return pht(
             'This application is required for Phabricator to operate, so all '.
             'users must have access to it.');
         } else {
           return null;
         }
       case PhabricatorPolicyCapability::CAN_EDIT:
         return null;
       default:
         $spec = $this->getCustomCapabilitySpecification($capability);
         return idx($spec, 'caption');
     }
   }
 
 }
diff --git a/src/applications/calendar/constants/CalendarColors.php b/src/applications/calendar/constants/CalendarColors.php
index 3f0b03b4ed..d5f4f7501c 100644
--- a/src/applications/calendar/constants/CalendarColors.php
+++ b/src/applications/calendar/constants/CalendarColors.php
@@ -1,30 +1,27 @@
 <?php
 
-/**
- * @group calendar
- */
 final class CalendarColors extends CalendarConstants {
 
   const COLOR_RED = 'red';
   const COLOR_ORANGE = 'orange';
   const COLOR_YELLOW = 'yellow';
   const COLOR_GREEN = 'green';
   const COLOR_BLUE = 'blue';
   const COLOR_SKY = 'sky';
   const COLOR_INDIGO = 'indigo';
   const COLOR_VIOLET = 'violet';
 
   public static function getColors() {
     return array(
       self::COLOR_SKY,
       self::COLOR_GREEN,
       self::COLOR_VIOLET,
       self::COLOR_ORANGE,
       self::COLOR_BLUE,
       self::COLOR_INDIGO,
       self::COLOR_RED,
       self::COLOR_YELLOW,
     );
   }
 
 }
diff --git a/src/applications/calendar/constants/CalendarConstants.php b/src/applications/calendar/constants/CalendarConstants.php
index 7c5c1111ed..4a67720c18 100644
--- a/src/applications/calendar/constants/CalendarConstants.php
+++ b/src/applications/calendar/constants/CalendarConstants.php
@@ -1,8 +1,3 @@
 <?php
 
-/**
- * @group calendar
- */
-abstract class CalendarConstants {
-
-}
+abstract class CalendarConstants {}
diff --git a/src/applications/chatlog/conduit/ConduitAPI_chatlog_Method.php b/src/applications/chatlog/conduit/ConduitAPI_chatlog_Method.php
index 20b0b6db88..cc5b61659a 100644
--- a/src/applications/chatlog/conduit/ConduitAPI_chatlog_Method.php
+++ b/src/applications/chatlog/conduit/ConduitAPI_chatlog_Method.php
@@ -1,12 +1,9 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class ConduitAPI_chatlog_Method extends ConduitAPIMethod {
 
   public function getApplication() {
     return PhabricatorApplication::getByClass('PhabricatorApplicationChatLog');
   }
 
 }
diff --git a/src/applications/chatlog/conduit/ConduitAPI_chatlog_query_Method.php b/src/applications/chatlog/conduit/ConduitAPI_chatlog_query_Method.php
index cb5328eaa1..afd4c9dad1 100644
--- a/src/applications/chatlog/conduit/ConduitAPI_chatlog_query_Method.php
+++ b/src/applications/chatlog/conduit/ConduitAPI_chatlog_query_Method.php
@@ -1,64 +1,59 @@
 <?php
 
-/**
- * @group conduit
- */
-final class ConduitAPI_chatlog_query_Method
-  extends ConduitAPI_chatlog_Method {
+final class ConduitAPI_chatlog_query_Method extends ConduitAPI_chatlog_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
     return 'Retrieve chatter.';
   }
 
   public function defineParamTypes() {
     return array(
       'channels' => 'optional list<string>',
       'limit'    => 'optional int (default = 100)',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty list<dict>';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
-
     $query = new PhabricatorChatLogQuery();
 
     $channel_ids = $request->getValue('channelIDs');
     if ($channel_ids) {
       $query->withChannelIDs($channel_ids);
     }
 
     $limit = $request->getValue('limit');
     if (!$limit) {
       $limit = 100;
     }
     $query->setLimit($limit);
 
     $logs = $query->execute();
 
     $results = array();
     foreach ($logs as $log) {
       $results[] = array(
         'channelID'       => $log->getChannelID(),
         'epoch'           => $log->getEpoch(),
         'author'          => $log->getAuthor(),
         'type'            => $log->getType(),
         'message'         => $log->getMessage(),
         'loggedByPHID'    => $log->getLoggedByPHID(),
       );
     }
 
     return $results;
   }
 
 }
diff --git a/src/applications/chatlog/conduit/ConduitAPI_chatlog_record_Method.php b/src/applications/chatlog/conduit/ConduitAPI_chatlog_record_Method.php
index d31f040b5e..7ee3fb2f07 100644
--- a/src/applications/chatlog/conduit/ConduitAPI_chatlog_record_Method.php
+++ b/src/applications/chatlog/conduit/ConduitAPI_chatlog_record_Method.php
@@ -1,77 +1,72 @@
 <?php
 
-/**
- * @group conduit
- */
-final class ConduitAPI_chatlog_record_Method
-  extends ConduitAPI_chatlog_Method {
+final class ConduitAPI_chatlog_record_Method extends ConduitAPI_chatlog_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
     return 'Record chatter.';
   }
 
   public function defineParamTypes() {
     return array(
       'logs' => 'required list<dict>',
     );
   }
 
   public function defineReturnType() {
     return 'list<id>';
   }
 
   public function defineErrorTypes() {
-    return array(
-    );
+    return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $logs = $request->getValue('logs');
     if (!is_array($logs)) {
       $logs = array();
     }
 
     $template = new PhabricatorChatLogEvent();
     $template->setLoggedByPHID($request->getUser()->getPHID());
 
     $objs = array();
     foreach ($logs as $log) {
       $channel_name = idx($log, 'channel');
       $service_name = idx($log, 'serviceName');
       $service_type = idx($log, 'serviceType');
 
       $channel = id(new PhabricatorChatLogChannel())->loadOneWhere(
         'channelName = %s AND serviceName = %s AND serviceType = %s',
         $channel_name,
         $service_name,
         $service_type);
 
       if (!$channel) {
         $channel = id(new PhabricatorChatLogChannel())
           ->setChannelName($channel_name)
           ->setserviceName($service_name)
           ->setServiceType($service_type)
           ->setViewPolicy(PhabricatorPolicies::POLICY_USER)
           ->setEditPolicy(PhabricatorPolicies::POLICY_USER)
           ->save();
       }
 
       $obj = clone $template;
       $obj->setChannelID($channel->getID());
       $obj->setType(idx($log, 'type'));
       $obj->setAuthor(idx($log, 'author'));
       $obj->setEpoch(idx($log, 'epoch'));
       $obj->setMessage(idx($log, 'message'));
       $obj->save();
 
       $objs[] = $obj;
     }
 
     return array_values(mpull($objs, 'getID'));
   }
 
 }
diff --git a/src/applications/conduit/controller/PhabricatorConduitAPIController.php b/src/applications/conduit/controller/PhabricatorConduitAPIController.php
index 27b4a176e6..5a65b1fe71 100644
--- a/src/applications/conduit/controller/PhabricatorConduitAPIController.php
+++ b/src/applications/conduit/controller/PhabricatorConduitAPIController.php
@@ -1,470 +1,468 @@
 <?php
 
-/**
- * @group conduit
- */
 final class PhabricatorConduitAPIController
   extends PhabricatorConduitController {
 
   public function shouldRequireLogin() {
     return false;
   }
 
   private $method;
 
   public function willProcessRequest(array $data) {
     $this->method = $data['method'];
     return $this;
   }
 
   public function processRequest() {
     $time_start = microtime(true);
     $request = $this->getRequest();
 
     $method = $this->method;
 
     $api_request = null;
 
     $log = new PhabricatorConduitMethodCallLog();
     $log->setMethod($method);
     $metadata = array();
 
     try {
 
       $params = $this->decodeConduitParams($request, $method);
       $metadata = idx($params, '__conduit__', array());
       unset($params['__conduit__']);
 
       $call = new ConduitCall(
         $method, $params, idx($metadata, 'isProxied', false));
 
       $result = null;
 
       // TODO: Straighten out the auth pathway here. We shouldn't be creating
       // a ConduitAPIRequest at this level, but some of the auth code expects
       // it. Landing a halfway version of this to unblock T945.
 
       $api_request = new ConduitAPIRequest($params);
 
       $allow_unguarded_writes = false;
       $auth_error = null;
       $conduit_username = '-';
       if ($call->shouldRequireAuthentication()) {
         $metadata['scope'] = $call->getRequiredScope();
         $auth_error = $this->authenticateUser($api_request, $metadata);
         // If we've explicitly authenticated the user here and either done
         // CSRF validation or are using a non-web authentication mechanism.
         $allow_unguarded_writes = true;
 
         if (isset($metadata['actAsUser'])) {
           $this->actAsUser($api_request, $metadata['actAsUser']);
         }
 
         if ($auth_error === null) {
           $conduit_user = $api_request->getUser();
           if ($conduit_user && $conduit_user->getPHID()) {
             $conduit_username = $conduit_user->getUsername();
           }
           $call->setUser($api_request->getUser());
         }
       }
 
       $access_log = PhabricatorAccessLog::getLog();
       if ($access_log) {
         $access_log->setData(
           array(
             'u' => $conduit_username,
             'm' => $method,
           ));
       }
 
       if ($call->shouldAllowUnguardedWrites()) {
         $allow_unguarded_writes = true;
       }
 
       if ($auth_error === null) {
         if ($allow_unguarded_writes) {
           $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
         }
 
         try {
           $result = $call->execute();
           $error_code = null;
           $error_info = null;
         } catch (ConduitException $ex) {
           $result = null;
           $error_code = $ex->getMessage();
           if ($ex->getErrorDescription()) {
             $error_info = $ex->getErrorDescription();
           } else {
             $error_info = $call->getErrorDescription($error_code);
           }
         }
         if ($allow_unguarded_writes) {
           unset($unguarded);
         }
       } else {
         list($error_code, $error_info) = $auth_error;
       }
     } catch (Exception $ex) {
       phlog($ex);
       $result = null;
       $error_code = ($ex instanceof ConduitException
         ? 'ERR-CONDUIT-CALL'
         : 'ERR-CONDUIT-CORE');
       $error_info = $ex->getMessage();
     }
 
     $time_end = microtime(true);
 
     $connection_id = null;
     if (idx($metadata, 'connectionID')) {
       $connection_id = $metadata['connectionID'];
     } else if (($method == 'conduit.connect') && $result) {
       $connection_id = idx($result, 'connectionID');
     }
 
     $log
       ->setCallerPHID(
         isset($conduit_user)
           ? $conduit_user->getPHID()
           : null)
       ->setConnectionID($connection_id)
       ->setError((string)$error_code)
       ->setDuration(1000000 * ($time_end - $time_start));
 
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
     $log->save();
     unset($unguarded);
 
     $response = id(new ConduitAPIResponse())
       ->setResult($result)
       ->setErrorCode($error_code)
       ->setErrorInfo($error_info);
 
     switch ($request->getStr('output')) {
       case 'human':
         return $this->buildHumanReadableResponse(
           $method,
           $api_request,
           $response->toDictionary());
       case 'json':
       default:
         return id(new AphrontJSONResponse())
           ->setAddJSONShield(false)
           ->setContent($response->toDictionary());
     }
   }
 
   /**
    * Change the api request user to the user that we want to act as.
    * Only admins can use actAsUser
    *
    * @param   ConduitAPIRequest Request being executed.
    * @param   string            The username of the user we want to act as
    */
   private function actAsUser(
     ConduitAPIRequest $api_request,
     $user_name) {
 
     if (!$api_request->getUser()->getIsAdmin()) {
       throw new Exception('Only administrators can use actAsUser');
     }
 
     $user = id(new PhabricatorUser())->loadOneWhere(
       'userName = %s',
       $user_name);
 
     if (!$user) {
       throw new Exception(
         "The actAsUser username '{$user_name}' is not a valid user."
       );
     }
 
     $api_request->setUser($user);
   }
 
   /**
    * Authenticate the client making the request to a Phabricator user account.
    *
    * @param   ConduitAPIRequest Request being executed.
    * @param   dict              Request metadata.
    * @return  null|pair         Null to indicate successful authentication, or
    *                            an error code and error message pair.
    */
   private function authenticateUser(
     ConduitAPIRequest $api_request,
     array $metadata) {
 
     $request = $this->getRequest();
 
     if ($request->getUser()->getPHID()) {
       $request->validateCSRF();
       return $this->validateAuthenticatedUser(
         $api_request,
         $request->getUser());
     }
 
     // handle oauth
     $access_token = $request->getStr('access_token');
     $method_scope = $metadata['scope'];
     if ($access_token &&
         $method_scope != PhabricatorOAuthServerScope::SCOPE_NOT_ACCESSIBLE) {
       $token = id(new PhabricatorOAuthServerAccessToken())
         ->loadOneWhere('token = %s',
                        $access_token);
       if (!$token) {
         return array(
           'ERR-INVALID-AUTH',
           'Access token does not exist.',
         );
       }
 
       $oauth_server = new PhabricatorOAuthServer();
       $valid = $oauth_server->validateAccessToken($token,
                                                   $method_scope);
       if (!$valid) {
         return array(
           'ERR-INVALID-AUTH',
           'Access token is invalid.',
         );
       }
 
       // valid token, so let's log in the user!
       $user_phid = $token->getUserPHID();
       $user = id(new PhabricatorUser())
         ->loadOneWhere('phid = %s',
                        $user_phid);
       if (!$user) {
         return array(
           'ERR-INVALID-AUTH',
           'Access token is for invalid user.',
         );
       }
       return $this->validateAuthenticatedUser(
         $api_request,
         $user);
     }
 
     // Handle sessionless auth. TOOD: This is super messy.
     if (isset($metadata['authUser'])) {
       $user = id(new PhabricatorUser())->loadOneWhere(
         'userName = %s',
         $metadata['authUser']);
       if (!$user) {
         return array(
           'ERR-INVALID-AUTH',
           'Authentication is invalid.',
         );
       }
       $token = idx($metadata, 'authToken');
       $signature = idx($metadata, 'authSignature');
       $certificate = $user->getConduitCertificate();
       if (sha1($token.$certificate) !== $signature) {
         return array(
           'ERR-INVALID-AUTH',
           'Authentication is invalid.',
         );
       }
       return $this->validateAuthenticatedUser(
         $api_request,
         $user);
     }
 
     $session_key = idx($metadata, 'sessionKey');
     if (!$session_key) {
       return array(
         'ERR-INVALID-SESSION',
         'Session key is not present.'
       );
     }
 
     $user = id(new PhabricatorAuthSessionEngine())
       ->loadUserForSession(PhabricatorAuthSession::TYPE_CONDUIT, $session_key);
 
     if (!$user) {
       return array(
         'ERR-INVALID-SESSION',
         'Session key is invalid.',
       );
     }
 
     return $this->validateAuthenticatedUser(
       $api_request,
       $user);
   }
 
   private function validateAuthenticatedUser(
     ConduitAPIRequest $request,
     PhabricatorUser $user) {
 
     if (!$user->isUserActivated()) {
       return array(
         'ERR-USER-DISABLED',
         pht('User account is not activated.'),
       );
     }
 
     $request->setUser($user);
     return null;
   }
 
   private function buildHumanReadableResponse(
     $method,
     ConduitAPIRequest $request = null,
     $result = null) {
 
     $param_rows = array();
     $param_rows[] = array('Method', $this->renderAPIValue($method));
     if ($request) {
       foreach ($request->getAllParameters() as $key => $value) {
         $param_rows[] = array(
           $key,
           $this->renderAPIValue($value),
         );
       }
     }
 
     $param_table = new AphrontTableView($param_rows);
     $param_table->setDeviceReadyTable(true);
     $param_table->setColumnClasses(
       array(
         'header',
         'wide',
       ));
 
     $result_rows = array();
     foreach ($result as $key => $value) {
       $result_rows[] = array(
         $key,
         $this->renderAPIValue($value),
       );
     }
 
     $result_table = new AphrontTableView($result_rows);
     $result_table->setDeviceReadyTable(true);
     $result_table->setColumnClasses(
       array(
         'header',
         'wide',
       ));
 
     $param_panel = new AphrontPanelView();
     $param_panel->setHeader('Method Parameters');
     $param_panel->appendChild($param_table);
 
     $result_panel = new AphrontPanelView();
     $result_panel->setHeader('Method Result');
     $result_panel->appendChild($result_table);
 
     $param_head = id(new PHUIHeaderView())
       ->setHeader(pht('Method Parameters'));
 
     $result_head = id(new PHUIHeaderView())
       ->setHeader(pht('Method Result'));
 
     $method_uri = $this->getApplicationURI('method/'.$method.'/');
 
     $crumbs = $this->buildApplicationCrumbs()
       ->addTextCrumb($method, $method_uri)
       ->addTextCrumb(pht('Call'));
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $param_head,
         $param_table,
         $result_head,
         $result_table,
       ),
       array(
         'title' => 'Method Call Result',
       ));
   }
 
   private function renderAPIValue($value) {
     $json = new PhutilJSON();
     if (is_array($value)) {
       $value = $json->encodeFormatted($value);
     }
 
     $value = phutil_tag(
       'pre',
       array('style' => 'white-space: pre-wrap;'),
       $value);
 
     return $value;
   }
 
   private function decodeConduitParams(
     AphrontRequest $request,
     $method) {
 
     // Look for parameters from the Conduit API Console, which are encoded
     // as HTTP POST parameters in an array, e.g.:
     //
     //   params[name]=value&params[name2]=value2
     //
     // The fields are individually JSON encoded, since we require users to
     // enter JSON so that we avoid type ambiguity.
 
     $params = $request->getArr('params', null);
     if ($params !== null) {
       foreach ($params as $key => $value) {
         if ($value == '') {
           // Interpret empty string null (e.g., the user didn't type anything
           // into the box).
           $value = 'null';
         }
         $decoded_value = json_decode($value, true);
         if ($decoded_value === null && strtolower($value) != 'null') {
           // When json_decode() fails, it returns null. This almost certainly
           // indicates that a user was using the web UI and didn't put quotes
           // around a string value. We can either do what we think they meant
           // (treat it as a string) or fail. For now, err on the side of
           // caution and fail. In the future, if we make the Conduit API
           // actually do type checking, it might be reasonable to treat it as
           // a string if the parameter type is string.
           throw new Exception(
             "The value for parameter '{$key}' is not valid JSON. All ".
             "parameters must be encoded as JSON values, including strings ".
             "(which means you need to surround them in double quotes). ".
             "Check your syntax. Value was: {$value}");
         }
         $params[$key] = $decoded_value;
       }
 
       return $params;
     }
 
     // Otherwise, look for a single parameter called 'params' which has the
     // entire param dictionary JSON encoded. This is the usual case for remote
     // requests.
 
     $params_json = $request->getStr('params');
     if (!strlen($params_json)) {
       if ($request->getBool('allowEmptyParams')) {
         // TODO: This is a bit messy, but otherwise you can't call
         // "conduit.ping" from the web console.
         $params = array();
       } else {
         throw new Exception(
           "Request has no 'params' key. This may mean that an extension like ".
           "Suhosin has dropped data from the request. Check the PHP ".
           "configuration on your server. If you are developing a Conduit ".
           "client, you MUST provide a 'params' parameter when making a ".
           "Conduit request, even if the value is empty (e.g., provide '{}').");
       }
     } else {
       $params = json_decode($params_json, true);
       if (!is_array($params)) {
         throw new Exception(
           "Invalid parameter information was passed to method ".
           "'{$method}', could not decode JSON serialization. Data: ".
           $params_json);
       }
     }
 
     return $params;
   }
+
 }
diff --git a/src/applications/conduit/controller/PhabricatorConduitController.php b/src/applications/conduit/controller/PhabricatorConduitController.php
index 91cf834b55..c7ceaf4ce6 100644
--- a/src/applications/conduit/controller/PhabricatorConduitController.php
+++ b/src/applications/conduit/controller/PhabricatorConduitController.php
@@ -1,31 +1,27 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class PhabricatorConduitController extends PhabricatorController {
 
   protected function buildSideNavView() {
     $viewer = $this->getRequest()->getUser();
 
     $nav = new AphrontSideNavFilterView();
     $nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
 
     id(new PhabricatorConduitSearchEngine())
       ->setViewer($viewer)
       ->addNavigationItems($nav->getMenu());
 
     $nav->addLabel('Logs');
     $nav->addFilter('log', pht('Call Logs'));
 
     $nav->selectFilter(null);
 
     return $nav;
   }
 
   protected function buildApplicationMenu() {
     return $this->buildSideNavView()->getMenu();
   }
 
-
 }
diff --git a/src/applications/conduit/controller/PhabricatorConduitLogController.php b/src/applications/conduit/controller/PhabricatorConduitLogController.php
index 60597e5aef..07c48dd2f5 100644
--- a/src/applications/conduit/controller/PhabricatorConduitLogController.php
+++ b/src/applications/conduit/controller/PhabricatorConduitLogController.php
@@ -1,132 +1,129 @@
 <?php
 
-/**
- * @group conduit
- */
 final class PhabricatorConduitLogController
   extends PhabricatorConduitController {
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $conn_table = new PhabricatorConduitConnectionLog();
     $call_table = new PhabricatorConduitMethodCallLog();
 
     $conn_r = $call_table->establishConnection('r');
 
     $pager = new AphrontCursorPagerView();
     $pager->readFromRequest($request);
     $pager->setPageSize(500);
 
     $query = id(new PhabricatorConduitLogQuery())
       ->setViewer($viewer);
 
     $methods = $request->getStrList('methods');
     if ($methods) {
       $query->withMethods($methods);
     }
 
     $calls = $query->executeWithCursorPager($pager);
 
     $conn_ids = array_filter(mpull($calls, 'getConnectionID'));
     $conns = array();
     if ($conn_ids) {
       $conns = $conn_table->loadAllWhere(
         'id IN (%Ld)',
         $conn_ids);
     }
 
     $table = $this->renderCallTable($calls, $conns);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Call Logs'));
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $table,
         $pager,
       ),
       array(
         'title' => 'Conduit Logs',
       ));
   }
 
   private function renderCallTable(array $calls, array $conns) {
     assert_instances_of($calls, 'PhabricatorConduitMethodCallLog');
     assert_instances_of($conns, 'PhabricatorConduitConnectionLog');
 
     $viewer = $this->getRequest()->getUser();
 
     $methods = id(new PhabricatorConduitMethodQuery())
       ->setViewer($viewer)
       ->execute();
     $methods = mpull($methods, null, 'getAPIMethodName');
 
     $rows = array();
     foreach ($calls as $call) {
       $conn = idx($conns, $call->getConnectionID());
       if ($conn) {
         $name = $conn->getUserName();
         $client = ' (via '.$conn->getClient().')';
       } else {
         $name = null;
         $client = null;
       }
 
       $method = idx($methods, $call->getMethod());
       if ($method) {
         switch ($method->getMethodStatus()) {
           case ConduitAPIMethod::METHOD_STATUS_STABLE:
             $status = null;
             break;
           case ConduitAPIMethod::METHOD_STATUS_UNSTABLE:
             $status = pht('Unstable');
             break;
           case ConduitAPIMethod::METHOD_STATUS_DEPRECATED:
             $status = pht('Deprecated');
             break;
         }
       } else {
         $status = pht('Unknown');
       }
 
       $rows[] = array(
         $call->getConnectionID(),
         $name,
         array($call->getMethod(), $client),
         $status,
         $call->getError(),
         number_format($call->getDuration()).' us',
         phabricator_datetime($call->getDateCreated(), $viewer),
       );
     }
 
     $table = id(new AphrontTableView($rows))
       ->setDeviceReadyTable(true);
 
     $table->setHeaders(
       array(
         'Connection',
         'User',
         'Method',
         'Status',
         'Error',
         'Duration',
         'Date',
       ));
     $table->setColumnClasses(
       array(
         '',
         '',
         'wide',
         '',
         '',
         'n',
         'right',
       ));
     return $table;
   }
 
 }
diff --git a/src/applications/conduit/controller/PhabricatorConduitTokenController.php b/src/applications/conduit/controller/PhabricatorConduitTokenController.php
index ac8fccb687..c0d230f1bb 100644
--- a/src/applications/conduit/controller/PhabricatorConduitTokenController.php
+++ b/src/applications/conduit/controller/PhabricatorConduitTokenController.php
@@ -1,75 +1,73 @@
 <?php
 
-/**
- * @group conduit
- */
 final class PhabricatorConduitTokenController
   extends PhabricatorConduitController {
 
   public function processRequest() {
     $user = $this->getRequest()->getUser();
 
     id(new PhabricatorAuthSessionEngine())->requireHighSecuritySession(
       $user,
       $this->getRequest(),
       '/');
 
     // Ideally we'd like to verify this, but it's fine to leave it unguarded
     // for now and verifying it would need some Ajax junk or for the user to
     // click a button or similar.
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
 
     $old_token = id(new PhabricatorConduitCertificateToken())
       ->loadOneWhere(
         'userPHID = %s',
         $user->getPHID());
     if ($old_token) {
       $old_token->delete();
     }
 
     $token = id(new PhabricatorConduitCertificateToken())
       ->setUserPHID($user->getPHID())
       ->setToken(Filesystem::readRandomCharacters(40))
       ->save();
 
     unset($unguarded);
 
     $pre_instructions = pht(
       'Copy and paste this token into the prompt given to you by '.
       '`arc install-certificate`');
 
     $post_instructions = pht(
       'After you copy and paste this token, `arc` will complete '.
       'the certificate install process for you.');
 
     Javelin::initBehavior('select-on-click');
 
     $form = id(new AphrontFormView())
       ->setUser($user)
       ->appendRemarkupInstructions($pre_instructions)
       ->appendChild(
         id(new AphrontFormTextAreaControl())
           ->setLabel(pht('Token'))
           ->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_SHORT)
           ->setReadonly(true)
           ->setSigil('select-on-click')
           ->setValue($token->getToken()))
       ->appendRemarkupInstructions($post_instructions);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Install Certificate'));
 
     $object_box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Certificate Token'))
       ->setForm($form);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $object_box,
       ),
       array(
         'title' => pht('Certificate Install Token'),
       ));
   }
+
 }
diff --git a/src/applications/conduit/method/ConduitAPI_conduit_connect_Method.php b/src/applications/conduit/method/ConduitAPI_conduit_connect_Method.php
index 351d9b4a8c..db341da764 100644
--- a/src/applications/conduit/method/ConduitAPI_conduit_connect_Method.php
+++ b/src/applications/conduit/method/ConduitAPI_conduit_connect_Method.php
@@ -1,161 +1,155 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_conduit_connect_Method extends ConduitAPIMethod {
 
   public function shouldRequireAuthentication() {
     return false;
   }
 
   public function shouldAllowUnguardedWrites() {
     return true;
   }
 
   public function getMethodDescription() {
     return 'Connect a session-based client.';
   }
 
   public function defineParamTypes() {
     return array(
       'client'              => 'required string',
       'clientVersion'       => 'required int',
       'clientDescription'   => 'optional string',
       'user'                => 'optional string',
       'authToken'           => 'optional int',
       'authSignature'       => 'optional string',
       'host'                => 'deprecated',
     );
   }
 
   public function defineReturnType() {
     return 'dict<string, any>';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-BAD-VERSION' =>
         'Client/server version mismatch. Upgrade your server or downgrade '.
         'your client.',
       'NEW-ARC-VERSION' =>
         'Client/server version mismatch. Upgrade your client.',
       'ERR-UNKNOWN-CLIENT' =>
         'Client is unknown.',
       'ERR-INVALID-USER' =>
         'The username you are attempting to authenticate with is not valid.',
       'ERR-INVALID-CERTIFICATE' =>
         'Your authentication certificate for this server is invalid.',
       'ERR-INVALID-TOKEN' =>
         "The challenge token you are authenticating with is outside of the ".
         "allowed time range. Either your system clock is out of whack or ".
         "you're executing a replay attack.",
       'ERR-NO-CERTIFICATE' => 'This server requires authentication.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
-
     $client = $request->getValue('client');
     $client_version = (int)$request->getValue('clientVersion');
     $client_description = (string)$request->getValue('clientDescription');
     // TODO: This should be character-oriented, not display-oriented.
     // See T3307.
     $client_description = phutil_utf8_shorten($client_description, 255);
     $username = (string)$request->getValue('user');
 
     // Log the connection, regardless of the outcome of checks below.
     $connection = new PhabricatorConduitConnectionLog();
     $connection->setClient($client);
     $connection->setClientVersion($client_version);
     $connection->setClientDescription($client_description);
     $connection->setUsername($username);
     $connection->save();
 
     switch ($client) {
       case 'arc':
         $server_version = 6;
         $supported_versions = array(
           $server_version => true,
           // Client version 5 introduced "user.query" call
           4               => true,
           // Client version 6 introduced "diffusion.getlintmessages" call
           5               => true,
         );
 
         if (empty($supported_versions[$client_version])) {
           if ($server_version < $client_version) {
             $ex = new ConduitException('ERR-BAD-VERSION');
             $ex->setErrorDescription(
               "Your 'arc' client version is '{$client_version}', which ".
               "is newer than the server version, '{$server_version}'. ".
               "Upgrade your Phabricator install.");
           } else {
             $ex = new ConduitException('NEW-ARC-VERSION');
             $ex->setErrorDescription(
               "A new version of arc is available! You need to upgrade ".
               "to connect to this server (you are running version ".
               "{$client_version}, the server is running version ".
               "{$server_version}).");
           }
           throw $ex;
         }
         break;
       default:
         // Allow new clients by default.
         break;
     }
 
     $token = $request->getValue('authToken');
     $signature = $request->getValue('authSignature');
 
-    $user = id(new PhabricatorUser())->loadOneWhere(
-      'username = %s',
-      $username);
+    $user = id(new PhabricatorUser())->loadOneWhere('username = %s', $username);
     if (!$user) {
       throw new ConduitException('ERR-INVALID-USER');
     }
 
     $session_key = null;
     if ($token && $signature) {
       $threshold = 60 * 15;
       $now = time();
       if (abs($token - $now) > $threshold) {
         throw id(new ConduitException('ERR-INVALID-TOKEN'))
           ->setErrorDescription(
             pht(
               'The request you submitted is signed with a timestamp, but that '.
               'timestamp is not within %s of the current time. The '.
               'signed timestamp is %s (%s), and the current server time is '.
               '%s (%s). This is a difference of %s seconds, but the '.
               'timestamp must differ from the server time by no more than '.
               '%s seconds. Your client or server clock may not be set '.
               'correctly.',
               phabricator_format_relative_time($threshold),
               $token,
               date('r', $token),
               $now,
               date('r', $now),
               ($token - $now),
               $threshold));
       }
       $valid = sha1($token.$user->getConduitCertificate());
       if ($valid != $signature) {
         throw new ConduitException('ERR-INVALID-CERTIFICATE');
       }
       $session_key = id(new PhabricatorAuthSessionEngine())->establishSession(
         PhabricatorAuthSession::TYPE_CONDUIT,
         $user->getPHID(),
         $partial = false);
     } else {
       throw new ConduitException('ERR-NO-CERTIFICATE');
     }
 
     return array(
       'connectionID'  => $connection->getID(),
       'sessionKey'    => $session_key,
       'userPHID'      => $user->getPHID(),
     );
   }
 
 }
diff --git a/src/applications/conduit/method/ConduitAPI_conduit_getcertificate_Method.php b/src/applications/conduit/method/ConduitAPI_conduit_getcertificate_Method.php
index d8db634c5b..e03bed8c07 100644
--- a/src/applications/conduit/method/ConduitAPI_conduit_getcertificate_Method.php
+++ b/src/applications/conduit/method/ConduitAPI_conduit_getcertificate_Method.php
@@ -1,91 +1,88 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_conduit_getcertificate_Method extends ConduitAPIMethod {
 
   public function shouldRequireAuthentication() {
     return false;
   }
 
   public function shouldAllowUnguardedWrites() {
     // This method performs logging and is on the authentication pathway.
     return true;
   }
 
   public function getMethodDescription() {
     return 'Retrieve certificate information for a user.';
   }
 
   public function defineParamTypes() {
     return array(
       'token' => 'required string',
       'host'  => 'required string',
     );
   }
 
   public function defineReturnType() {
     return 'dict<string, any>';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-BAD-TOKEN' => 'Token does not exist or has expired.',
       'ERR-RATE-LIMIT' =>
         'You have made too many invalid token requests recently. Wait before '.
         'making more.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $failed_attempts = PhabricatorUserLog::loadRecentEventsFromThisIP(
       PhabricatorUserLog::ACTION_CONDUIT_CERTIFICATE_FAILURE,
       60 * 5);
 
     if (count($failed_attempts) > 5) {
       $this->logFailure($request);
       throw new ConduitException('ERR-RATE-LIMIT');
     }
 
     $token = $request->getValue('token');
     $info = id(new PhabricatorConduitCertificateToken())->loadOneWhere(
       'token = %s',
       trim($token));
 
     if (!$info || $info->getDateCreated() < time() - (60 * 15)) {
       $this->logFailure($request, $info);
       throw new ConduitException('ERR-BAD-TOKEN');
     } else {
       $log = PhabricatorUserLog::initializeNewLog(
           $request->getUser(),
           $info->getUserPHID(),
           PhabricatorUserLog::ACTION_CONDUIT_CERTIFICATE)
         ->save();
     }
 
     $user = id(new PhabricatorUser())->loadOneWhere(
       'phid = %s',
       $info->getUserPHID());
     if (!$user) {
       throw new Exception('Certificate token points to an invalid user!');
     }
 
     return array(
       'username'    => $user->getUserName(),
       'certificate' => $user->getConduitCertificate(),
     );
   }
 
   private function logFailure(
-      ConduitAPIRequest $request,
-      PhabricatorConduitCertificateToken $info = null) {
+    ConduitAPIRequest $request,
+    PhabricatorConduitCertificateToken $info = null) {
 
     $log = PhabricatorUserLog::initializeNewLog(
         $request->getUser(),
         $info ? $info->getUserPHID() : '-',
         PhabricatorUserLog::ACTION_CONDUIT_CERTIFICATE_FAILURE)
       ->save();
   }
 
 }
diff --git a/src/applications/conduit/method/ConduitAPI_conduit_ping_Method.php b/src/applications/conduit/method/ConduitAPI_conduit_ping_Method.php
index d05b3cd1a8..1131c23884 100644
--- a/src/applications/conduit/method/ConduitAPI_conduit_ping_Method.php
+++ b/src/applications/conduit/method/ConduitAPI_conduit_ping_Method.php
@@ -1,31 +1,29 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_conduit_ping_Method extends ConduitAPIMethod {
 
   public function shouldRequireAuthentication() {
     return false;
   }
 
   public function getMethodDescription() {
     return 'Basic ping for monitoring or a health-check.';
   }
 
   public function defineParamTypes() {
     return array();
   }
 
   public function defineReturnType() {
     return 'string';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     return php_uname('n');
   }
+
 }
diff --git a/src/applications/conduit/method/ConduitAPI_conduit_query_Method.php b/src/applications/conduit/method/ConduitAPI_conduit_query_Method.php
index b8f0f45335..0d18e7bbf5 100644
--- a/src/applications/conduit/method/ConduitAPI_conduit_query_Method.php
+++ b/src/applications/conduit/method/ConduitAPI_conduit_query_Method.php
@@ -1,41 +1,38 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_conduit_query_Method extends ConduitAPIMethod {
 
   public function getMethodDescription() {
     return 'Returns the parameters of the Conduit methods.';
   }
 
   public function defineParamTypes() {
     return array();
   }
 
   public function defineReturnType() {
     return 'dict<dict>';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $classes = id(new PhutilSymbolLoader())
       ->setAncestorClass('ConduitAPIMethod')
       ->setType('class')
       ->setConcreteOnly(true)
       ->selectSymbolsWithoutLoading();
 
     $names_to_params = array();
     foreach ($classes as $class) {
       $method_name = $class['name'];
       $obj = newv($method_name, array());
       $names_to_params[$this->getAPIMethodNameFromClassName($method_name)] =
         array('params' => $obj->defineParamTypes());
     }
     return $names_to_params;
   }
 
 }
diff --git a/src/applications/conduit/protocol/ConduitAPIRequest.php b/src/applications/conduit/protocol/ConduitAPIRequest.php
index 1a3fad4853..b25cedfbb5 100644
--- a/src/applications/conduit/protocol/ConduitAPIRequest.php
+++ b/src/applications/conduit/protocol/ConduitAPIRequest.php
@@ -1,48 +1,45 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPIRequest {
 
   protected $params;
   private $user;
 
   public function __construct(array $params) {
     $this->params = $params;
   }
 
   public function getValue($key, $default = null) {
     return coalesce(idx($this->params, $key), $default);
   }
 
   public function getAllParameters() {
     return $this->params;
   }
 
   public function setUser(PhabricatorUser $user) {
     $this->user = $user;
     return $this;
   }
 
   /**
    * Retrieve the authentic identity of the user making the request. If a
    * method requires authentication (the default) the user object will always
    * be available. If a method does not require authentication (i.e., overrides
    * shouldRequireAuthentication() to return false) the user object will NEVER
    * be available.
    *
    * @return PhabricatorUser Authentic user, available ONLY if the method
    *                         requires authentication.
    */
   public function getUser() {
     if (!$this->user) {
       throw new Exception(
         'You can not access the user inside the implementation of a Conduit '.
         'method which does not require authentication (as per '.
         'shouldRequireAuthentication()).');
     }
     return $this->user;
   }
 
 }
diff --git a/src/applications/conduit/protocol/ConduitAPIResponse.php b/src/applications/conduit/protocol/ConduitAPIResponse.php
index 0e604019dd..6a86aa38b8 100644
--- a/src/applications/conduit/protocol/ConduitAPIResponse.php
+++ b/src/applications/conduit/protocol/ConduitAPIResponse.php
@@ -1,43 +1,43 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPIResponse {
 
   private $result;
   private $errorCode;
   private $errorInfo;
 
   public function setResult($result) {
     $this->result = $result;
     return $this;
   }
+
   public function getResult() {
     return $this->result;
   }
 
   public function setErrorCode($error_code) {
     $this->errorCode = $error_code;
     return $this;
   }
+
   public function getErrorCode() {
     return $this->errorCode;
   }
 
   public function setErrorInfo($error_info) {
     $this->errorInfo = $error_info;
     return $this;
   }
   public function getErrorInfo() {
     return $this->errorInfo;
   }
 
   public function toDictionary() {
     return array(
       'result'     => $this->getResult(),
       'error_code' => $this->getErrorCode(),
       'error_info' => $this->getErrorInfo(),
     );
   }
+
 }
diff --git a/src/applications/conduit/protocol/ConduitException.php b/src/applications/conduit/protocol/ConduitException.php
index c916216df0..754889a494 100644
--- a/src/applications/conduit/protocol/ConduitException.php
+++ b/src/applications/conduit/protocol/ConduitException.php
@@ -1,32 +1,29 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitException extends Exception {
 
   private $errorDescription;
 
   /**
    * Set a detailed error description. If omitted, the generic error description
    * will be used instead. This is useful to provide specific information about
    * an exception (e.g., which values were wrong in an invalid request).
    *
    * @param string Detailed error description.
    * @return this
    */
   public function setErrorDescription($error_description) {
     $this->errorDescription = $error_description;
     return $this;
   }
 
   /**
    * Get a detailed error description, if available.
    *
    * @return string|null Error description, if one is available.
    */
   public function getErrorDescription() {
     return $this->errorDescription;
   }
 
 }
diff --git a/src/applications/conduit/storage/PhabricatorConduitCertificateToken.php b/src/applications/conduit/storage/PhabricatorConduitCertificateToken.php
index f480dcc1b8..3f92395670 100644
--- a/src/applications/conduit/storage/PhabricatorConduitCertificateToken.php
+++ b/src/applications/conduit/storage/PhabricatorConduitCertificateToken.php
@@ -1,11 +1,8 @@
 <?php
 
-/**
- * @group conduit
- */
 final class PhabricatorConduitCertificateToken extends PhabricatorConduitDAO {
 
   protected $userPHID;
   protected $token;
 
 }
diff --git a/src/applications/conduit/storage/PhabricatorConduitConnectionLog.php b/src/applications/conduit/storage/PhabricatorConduitConnectionLog.php
index f58ea28ad2..16699e2d0c 100644
--- a/src/applications/conduit/storage/PhabricatorConduitConnectionLog.php
+++ b/src/applications/conduit/storage/PhabricatorConduitConnectionLog.php
@@ -1,13 +1,10 @@
 <?php
 
-/**
- * @group conduit
- */
 final class PhabricatorConduitConnectionLog extends PhabricatorConduitDAO {
 
   protected $client;
   protected $clientVersion;
   protected $clientDescription;
   protected $username;
 
 }
diff --git a/src/applications/conduit/storage/PhabricatorConduitDAO.php b/src/applications/conduit/storage/PhabricatorConduitDAO.php
index 70e87d921f..517cf161b7 100644
--- a/src/applications/conduit/storage/PhabricatorConduitDAO.php
+++ b/src/applications/conduit/storage/PhabricatorConduitDAO.php
@@ -1,12 +1,9 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class PhabricatorConduitDAO extends PhabricatorLiskDAO {
 
   public function getApplicationName() {
     return 'conduit';
   }
 
 }
diff --git a/src/applications/conduit/storage/PhabricatorConduitMethodCallLog.php b/src/applications/conduit/storage/PhabricatorConduitMethodCallLog.php
index 7a2c36277c..e199ac4bbe 100644
--- a/src/applications/conduit/storage/PhabricatorConduitMethodCallLog.php
+++ b/src/applications/conduit/storage/PhabricatorConduitMethodCallLog.php
@@ -1,37 +1,35 @@
 <?php
 
-/**
- * @group conduit
- */
-final class PhabricatorConduitMethodCallLog extends PhabricatorConduitDAO
+final class PhabricatorConduitMethodCallLog
+  extends PhabricatorConduitDAO
   implements PhabricatorPolicyInterface {
 
   protected $callerPHID;
   protected $connectionID;
   protected $method;
   protected $error;
   protected $duration;
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
     );
   }
 
   public function getPolicy($capability) {
     return PhabricatorPolicies::POLICY_USER;
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return false;
   }
 
   public function describeAutomaticCapability($capability) {
     return null;
   }
 
 }
diff --git a/src/applications/conpherence/conduit/ConduitAPI_conpherence_Method.php b/src/applications/conpherence/conduit/ConduitAPI_conpherence_Method.php
index 600841629e..a8e781af0c 100644
--- a/src/applications/conpherence/conduit/ConduitAPI_conpherence_Method.php
+++ b/src/applications/conpherence/conduit/ConduitAPI_conpherence_Method.php
@@ -1,20 +1,16 @@
 <?php
 
-/**
- * @group conduit
- */
-abstract class ConduitAPI_conpherence_Method
-  extends ConduitAPIMethod {
+abstract class ConduitAPI_conpherence_Method extends ConduitAPIMethod {
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
       'PhabricatorApplicationConpherence');
   }
 
   final protected function getConpherenceURI(ConpherenceThread $conpherence) {
     $id = $conpherence->getID();
     return PhabricatorEnv::getProductionURI(
       $this->getApplication()->getApplicationURI($id));
   }
 
 }
diff --git a/src/applications/conpherence/conduit/ConduitAPI_conpherence_createthread_Method.php b/src/applications/conpherence/conduit/ConduitAPI_conpherence_createthread_Method.php
index dc152d1eba..d047e2ae39 100644
--- a/src/applications/conpherence/conduit/ConduitAPI_conpherence_createthread_Method.php
+++ b/src/applications/conpherence/conduit/ConduitAPI_conpherence_createthread_Method.php
@@ -1,65 +1,63 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_conpherence_createthread_Method
   extends ConduitAPI_conpherence_Method {
 
   public function getMethodDescription() {
     return pht('Create a new conpherence thread.');
   }
 
   public function defineParamTypes() {
     return array(
       'title' => 'optional string',
       'message' => 'required string',
       'participantPHIDs' => 'required list<phids>'
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_EMPTY_PARTICIPANT_PHIDS' => pht(
         'You must specify participant phids.'),
       'ERR_EMPTY_MESSAGE' => pht(
         'You must specify a message.')
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
-
     $participant_phids = $request->getValue('participantPHIDs', array());
     $message = $request->getValue('message');
     $title = $request->getValue('title');
 
     list($errors, $conpherence) = ConpherenceEditor::createConpherence(
       $request->getUser(),
       $participant_phids,
       $title,
       $message,
       PhabricatorContentSource::newFromConduitRequest($request));
 
     if ($errors) {
       foreach ($errors as $error_code) {
         switch ($error_code) {
           case ConpherenceEditor::ERROR_EMPTY_MESSAGE:
             throw new ConduitException('ERR_EMPTY_MESSAGE');
             break;
           case ConpherenceEditor::ERROR_EMPTY_PARTICIPANTS:
             throw new ConduitException('ERR_EMPTY_PARTICIPANT_PHIDS');
             break;
         }
       }
     }
 
     return array(
       'conpherenceID' => $conpherence->getID(),
       'conpherencePHID' => $conpherence->getPHID(),
-      'conpherenceURI' => $this->getConpherenceURI($conpherence));
+      'conpherenceURI' => $this->getConpherenceURI($conpherence),
+    );
   }
+
 }
diff --git a/src/applications/conpherence/conduit/ConduitAPI_conpherence_querythread_Method.php b/src/applications/conpherence/conduit/ConduitAPI_conpherence_querythread_Method.php
index be04ce07d6..9f69d031bb 100644
--- a/src/applications/conpherence/conduit/ConduitAPI_conpherence_querythread_Method.php
+++ b/src/applications/conpherence/conduit/ConduitAPI_conpherence_querythread_Method.php
@@ -1,85 +1,82 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_conpherence_querythread_Method
   extends ConduitAPI_conpherence_Method {
 
-
   public function getMethodDescription() {
     return pht(
       'Query for conpherence threads for the logged in user. '.
       'You can query by ids or phids for specific conpherence threads. '.
       'Otherwise, specify limit and offset to query the most recently '.
       'updated conpherences for the logged in user.');
   }
 
   public function defineParamTypes() {
     return array(
       'ids' => 'optional array<int>',
       'phids' => 'optional array<phids>',
       'limit' => 'optional int',
       'offset' => 'optional int'
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $user = $request->getUser();
     $ids = $request->getValue('ids', array());
     $phids = $request->getValue('phids', array());
     $limit = $request->getValue('limit');
     $offset = $request->getValue('offset');
 
     $query = id(new ConpherenceThreadQuery())
       ->setViewer($user)
       ->needParticipantCache(true)
       ->needFilePHIDs(true);
 
     if ($ids) {
       $conpherences = $query
         ->withIDs($ids)
         ->setLimit($limit)
         ->setOffset($offset)
         ->execute();
     } else if ($phids) {
       $conpherences = $query
         ->withPHIDs($phids)
         ->setLimit($limit)
         ->setOffset($offset)
         ->execute();
     } else {
       $participation = id(new ConpherenceParticipantQuery())
         ->withParticipantPHIDs(array($user->getPHID()))
         ->setLimit($limit)
         ->setOffset($offset)
         ->execute();
       $conpherence_phids = array_keys($participation);
       $query->withPHIDs($conpherence_phids);
       $conpherences = $query->execute();
       $conpherences = array_select_keys($conpherences, $conpherence_phids);
     }
 
     $data = array();
     foreach ($conpherences as $conpherence) {
       $id = $conpherence->getID();
       $data[$id] = array(
         'conpherenceID' => $id,
         'conpherencePHID' => $conpherence->getPHID(),
         'conpherenceTitle' => $conpherence->getTitle(),
         'messageCount' => $conpherence->getMessageCount(),
         'recentParticipantPHIDs' => $conpherence->getRecentParticipantPHIDs(),
         'filePHIDs' => $conpherence->getFilePHIDs(),
         'conpherenceURI' => $this->getConpherenceURI($conpherence));
     }
     return $data;
   }
+
 }
diff --git a/src/applications/conpherence/conduit/ConduitAPI_conpherence_querytransaction_Method.php b/src/applications/conpherence/conduit/ConduitAPI_conpherence_querytransaction_Method.php
index f6ea2ad1ef..d83fd1caf4 100644
--- a/src/applications/conpherence/conduit/ConduitAPI_conpherence_querytransaction_Method.php
+++ b/src/applications/conpherence/conduit/ConduitAPI_conpherence_querytransaction_Method.php
@@ -1,95 +1,92 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_conpherence_querytransaction_Method
   extends ConduitAPI_conpherence_Method {
 
-
   public function getMethodDescription() {
     return pht(
       'Query for transactions for the logged in user within a specific '.
       'conpherence thread. You can specify the thread by id or phid. '.
       'Otherwise, specify limit and offset to query the most recent '.
       'transactions within the conpherence for the logged in user.');
   }
 
   public function defineParamTypes() {
     return array(
       'threadID' => 'optional int',
       'threadPHID' => 'optional phid',
       'limit' => 'optional int',
       'offset' => 'optional int'
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_USAGE_NO_THREAD_ID' => pht(
         'You must specify a thread id or thread phid to query transactions '.
         'from.')
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $user = $request->getUser();
     $thread_id = $request->getValue('threadID');
     $thread_phid = $request->getValue('threadPHID');
     $limit = $request->getValue('limit');
     $offset = $request->getValue('offset');
 
     $query = id(new ConpherenceThreadQuery())
       ->setViewer($user);
 
     if ($thread_id) {
       $query->withIDs(array($thread_id));
     } else if ($thread_phid) {
       $query->withPHIDs(array($thread_phid));
     } else {
       throw new ConduitException('ERR_USAGE_NO_THREAD_ID');
     }
 
     $conpherence = $query->executeOne();
 
     $query = id(new ConpherenceTransactionQuery())
       ->setViewer($user)
       ->withObjectPHIDs(array($conpherence->getPHID()))
       ->setLimit($limit)
       ->setOffset($offset);
 
     $transactions = $query->execute();
 
     $data = array();
     foreach ($transactions as $transaction) {
       $comment = null;
       $comment_obj = $transaction->getComment();
       if ($comment_obj) {
         $comment = $comment_obj->getContent();
       }
       $title = null;
       $title_obj = $transaction->getTitle();
       if ($title_obj) {
         $title = $title_obj->getHTMLContent();
       }
       $id = $transaction->getID();
       $data[$id] = array(
         'transactionID' => $id,
         'transactionType' => $transaction->getTransactionType(),
         'transactionTitle' => $title,
         'transactionComment' => $comment,
         'transactionOldValue' => $transaction->getOldValue(),
         'transactionNewValue' => $transaction->getNewValue(),
         'transactionMetadata' => $transaction->getMetadata(),
         'authorPHID' => $transaction->getAuthorPHID(),
         'dateCreated' => $transaction->getDateCreated(),
         'conpherenceID' => $conpherence->getID(),
         'conpherencePHID' => $conpherence->getPHID());
     }
     return $data;
   }
+
 }
diff --git a/src/applications/conpherence/conduit/ConduitAPI_conpherence_updatethread_Method.php b/src/applications/conpherence/conduit/ConduitAPI_conpherence_updatethread_Method.php
index 229a50ce93..c526ccb898 100644
--- a/src/applications/conpherence/conduit/ConduitAPI_conpherence_updatethread_Method.php
+++ b/src/applications/conpherence/conduit/ConduitAPI_conpherence_updatethread_Method.php
@@ -1,107 +1,105 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_conpherence_updatethread_Method
   extends ConduitAPI_conpherence_Method {
 
   public function getMethodDescription() {
     return pht('Update an existing conpherence thread.');
   }
 
   public function defineParamTypes() {
     return array(
       'id' => 'optional int',
       'phid' => 'optional phid',
       'title' => 'optional string',
       'message' => 'optional string',
       'addParticipantPHIDs' => 'optional list<phids>',
       'removeParticipantPHID' => 'optional phid'
     );
   }
 
   public function defineReturnType() {
     return 'bool';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_USAGE_NO_THREAD_ID' => pht(
         'You must specify a thread id or thread phid to query transactions '.
         'from.'),
       'ERR_USAGE_THREAD_NOT_FOUND' => pht(
         'Thread does not exist or logged in user can not see it.'),
       'ERR_USAGE_ONLY_SELF_REMOVE' => pht(
         'Only a user can remove themselves from a thread.'),
       'ERR_USAGE_NO_UPDATES' => pht(
         'You must specify data that actually updates the conpherence.')
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $user = $request->getUser();
     $id = $request->getValue('id');
     $phid = $request->getValue('phid');
     $query = id(new ConpherenceThreadQuery())
       ->setViewer($user)
       ->needFilePHIDs(true);
     if ($id) {
       $query->withIDs(array($id));
     } else if ($phid) {
       $query->withPHIDs(array($phid));
     } else {
       throw new ConduitException('ERR_USAGE_NO_THREAD_ID');
     }
     $conpherence = $query->executeOne();
     if (!$conpherence) {
       throw new ConduitException('ERR_USAGE_THREAD_NOT_FOUND');
     }
 
     $source = PhabricatorContentSource::newFromConduitRequest($request);
     $editor = id(new ConpherenceEditor())
       ->setContentSource($source)
       ->setActor($user);
     $xactions = array();
     $add_participant_phids = $request->getValue('addParticipantPHIDs', array());
     $remove_participant_phid = $request->getValue('removeParticipantPHID');
     $message = $request->getValue('message');
     $title = $request->getValue('title');
     if ($add_participant_phids) {
       $xactions[] = id(new ConpherenceTransaction())
         ->setTransactionType(
           ConpherenceTransactionType::TYPE_PARTICIPANTS)
         ->setNewValue(array('+' => $add_participant_phids));
     }
     if ($remove_participant_phid) {
       if ($remove_participant_phid != $user->getPHID()) {
         throw new ConduitException('ERR_USAGE_ONLY_SELF_REMOVE');
       }
       $xactions[] = id(new ConpherenceTransaction())
         ->setTransactionType(
           ConpherenceTransactionType::TYPE_PARTICIPANTS)
         ->setNewValue(array('-' => array($remove_participant_phid)));
     }
     if ($title) {
       $xactions[] = id(new ConpherenceTransaction())
         ->setTransactionType(ConpherenceTransactionType::TYPE_TITLE)
         ->setNewValue($title);
     }
     if ($message) {
       $xactions = array_merge(
         $xactions,
         $editor->generateTransactionsFromText(
           $user,
           $conpherence,
           $message));
     }
 
     try {
       $xactions = $editor->applyTransactions($conpherence, $xactions);
     } catch (PhabricatorApplicationTransactionNoEffectException $ex) {
       throw new ConduitException('ERR_USAGE_NO_UPDATES');
     }
 
     return true;
   }
+
 }
diff --git a/src/applications/conpherence/constants/ConpherenceConstants.php b/src/applications/conpherence/constants/ConpherenceConstants.php
index 09dcae8edb..01c884b2c9 100644
--- a/src/applications/conpherence/constants/ConpherenceConstants.php
+++ b/src/applications/conpherence/constants/ConpherenceConstants.php
@@ -1,8 +1,3 @@
 <?php
 
-/**
- * @group conpherence
- */
-abstract class ConpherenceConstants {
-
-}
+abstract class ConpherenceConstants {}
diff --git a/src/applications/conpherence/constants/ConpherenceTransactionType.php b/src/applications/conpherence/constants/ConpherenceTransactionType.php
index de23bd78a8..5136a85bec 100644
--- a/src/applications/conpherence/constants/ConpherenceTransactionType.php
+++ b/src/applications/conpherence/constants/ConpherenceTransactionType.php
@@ -1,17 +1,14 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceTransactionType extends ConpherenceConstants {
 
   const TYPE_FILES           = 'files';
   const TYPE_TITLE           = 'title';
   const TYPE_PARTICIPANTS    = 'participants';
   const TYPE_DATE_MARKER     = 'date-marker';
 
   /* these two are deprecated but keep them around for legacy installs */
   const TYPE_PICTURE         = 'picture';
   const TYPE_PICTURE_CROP    = 'picture-crop';
 
 }
diff --git a/src/applications/conpherence/controller/ConpherenceController.php b/src/applications/conpherence/controller/ConpherenceController.php
index bdb6f623fa..3347d4eddb 100644
--- a/src/applications/conpherence/controller/ConpherenceController.php
+++ b/src/applications/conpherence/controller/ConpherenceController.php
@@ -1,156 +1,154 @@
 <?php
 
-/**
- * @group conpherence
- */
 abstract class ConpherenceController extends PhabricatorController {
+
   private $conpherences;
 
   public function buildApplicationMenu() {
     $nav = new PHUIListView();
 
     $nav->newLink(
       pht('New Message'),
       $this->getApplicationURI('new/'));
 
     $nav->addMenuItem(
       id(new PHUIListItemView())
       ->setName(pht('Add Participants'))
       ->setType(PHUIListItemView::TYPE_LINK)
       ->setHref('#')
       ->addSigil('conpherence-widget-adder')
       ->setMetadata(array('widget' => 'widgets-people')));
 
     $nav->addMenuItem(
       id(new PHUIListItemView())
       ->setName(pht('New Calendar Item'))
       ->setType(PHUIListItemView::TYPE_LINK)
       ->setHref('/calendar/event/create/')
       ->addSigil('conpherence-widget-adder')
       ->setMetadata(array('widget' => 'widgets-calendar')));
 
     return $nav;
   }
 
   public function buildApplicationCrumbs() {
     $crumbs = parent::buildApplicationCrumbs();
 
     $crumbs
       ->addAction(
         id(new PHUIListItemView())
         ->setName(pht('New Message'))
         ->setHref($this->getApplicationURI('new/'))
         ->setIcon('fa-plus-square')
         ->setWorkflow(true))
       ->addAction(
         id(new PHUIListItemView())
         ->setName(pht('Thread'))
         ->setHref('#')
         ->setIcon('fa-bars')
         ->setStyle('display: none;')
         ->addClass('device-widgets-selector')
         ->addSigil('device-widgets-selector'));
     return $crumbs;
   }
 
   protected function buildHeaderPaneContent(ConpherenceThread $conpherence) {
     $crumbs = $this->buildApplicationCrumbs();
     if ($conpherence->getTitle()) {
       $title = $conpherence->getTitle();
     } else {
       $title = pht('[No Title]');
     }
     $crumbs->addCrumb(
       id(new PhabricatorCrumbView())
       ->setName($title)
       ->setHref($this->getApplicationURI('update/'.$conpherence->getID().'/'))
       ->setWorkflow(true));
 
     return hsprintf(
       '%s',
       array(
         phutil_tag(
           'div',
           array(
             'class' => 'header-loading-mask'
           ),
           ''),
         $crumbs));
   }
 
   protected function renderConpherenceTransactions(
     ConpherenceThread $conpherence) {
 
     $user = $this->getRequest()->getUser();
     $transactions = $conpherence->getTransactions();
     $oldest_transaction_id = 0;
     $too_many = ConpherenceThreadQuery::TRANSACTION_LIMIT + 1;
     if (count($transactions) == $too_many) {
       $last_transaction = end($transactions);
       unset($transactions[$last_transaction->getID()]);
       $oldest_transaction = end($transactions);
       $oldest_transaction_id = $oldest_transaction->getID();
     }
     $transactions = array_reverse($transactions);
     $handles = $conpherence->getHandles();
     $rendered_transactions = array();
     $engine = id(new PhabricatorMarkupEngine())
       ->setViewer($user);
     foreach ($transactions as $key => $transaction) {
       if ($transaction->shouldHide()) {
         unset($transactions[$key]);
         continue;
       }
       if ($transaction->getComment()) {
         $engine->addObject(
           $transaction->getComment(),
           PhabricatorApplicationTransactionComment::MARKUP_FIELD_COMMENT);
       }
     }
     $engine->process();
     // we're going to insert a dummy date marker transaction for breaks
     // between days. some setup required!
     $previous_transaction = null;
     $date_marker_transaction = id(new ConpherenceTransaction())
       ->setTransactionType(ConpherenceTransactionType::TYPE_DATE_MARKER)
       ->makeEphemeral();
     $date_marker_transaction_view = id(new ConpherenceTransactionView())
       ->setUser($user)
       ->setConpherenceTransaction($date_marker_transaction)
       ->setHandles($handles)
       ->setMarkupEngine($engine);
     foreach ($transactions as $transaction) {
       if ($previous_transaction) {
         $previous_day = phabricator_format_local_time(
           $previous_transaction->getDateCreated(),
           $user,
           'Ymd');
         $current_day = phabricator_format_local_time(
           $transaction->getDateCreated(),
           $user,
           'Ymd');
         // date marker transaction time!
         if ($previous_day != $current_day) {
           $date_marker_transaction->setDateCreated(
             $transaction->getDateCreated());
           $rendered_transactions[] = $date_marker_transaction_view->render();
         }
       }
       $rendered_transactions[] = id(new ConpherenceTransactionView())
         ->setUser($user)
         ->setConpherenceTransaction($transaction)
         ->setHandles($handles)
         ->setMarkupEngine($engine)
         ->render();
       $previous_transaction = $transaction;
     }
     $latest_transaction_id = $transaction->getID();
 
     return array(
       'transactions' => $rendered_transactions,
       'latest_transaction_id' => $latest_transaction_id,
-      'oldest_transaction_id' => $oldest_transaction_id
+      'oldest_transaction_id' => $oldest_transaction_id,
     );
-
   }
+
 }
diff --git a/src/applications/conpherence/controller/ConpherenceListController.php b/src/applications/conpherence/controller/ConpherenceListController.php
index 285015f005..0cf678ff67 100644
--- a/src/applications/conpherence/controller/ConpherenceListController.php
+++ b/src/applications/conpherence/controller/ConpherenceListController.php
@@ -1,256 +1,253 @@
 <?php
 
-/**
- * @group conpherence
- */
-final class ConpherenceListController
-  extends ConpherenceController {
+final class ConpherenceListController extends ConpherenceController {
 
   const SELECTED_MODE = 'selected';
   const UNSELECTED_MODE = 'unselected';
   const PAGING_MODE = 'paging';
 
   private $conpherenceID;
 
   public function setConpherenceID($conpherence_id) {
     $this->conpherenceID = $conpherence_id;
     return $this;
   }
   public function getConpherenceID() {
     return $this->conpherenceID;
   }
 
   public function willProcessRequest(array $data) {
     $this->setConpherenceID(idx($data, 'id'));
   }
 
   /**
    * Three main modes of operation...
    *
    * 1 - /conpherence/ - UNSELECTED_MODE
    * 2 - /conpherence/<id>/ - SELECTED_MODE
    * 3 - /conpherence/?direction='up'&... - PAGING_MODE
    *
    * UNSELECTED_MODE is not an Ajax request while the other two are Ajax
    * requests.
    */
   private function determineMode() {
     $request = $this->getRequest();
 
     $mode = self::UNSELECTED_MODE;
     if ($request->isAjax()) {
       if ($request->getStr('direction')) {
         $mode = self::PAGING_MODE;
       } else {
         $mode = self::SELECTED_MODE;
       }
     }
 
     return $mode;
   }
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
     $title = pht('Conpherence');
     $conpherence = null;
 
     $scroll_up_participant = $this->getEmptyParticipant();
     $scroll_down_participant = $this->getEmptyParticipant();
     $too_many = ConpherenceParticipantQuery::LIMIT + 1;
     $all_participation = array();
 
     $mode = $this->determineMode();
     switch ($mode) {
       case self::SELECTED_MODE:
         $conpherence_id = $this->getConpherenceID();
         $conpherence = id(new ConpherenceThreadQuery())
           ->setViewer($user)
           ->withIDs(array($conpherence_id))
           ->executeOne();
         if (!$conpherence) {
           return new Aphront404Response();
         }
         if ($conpherence->getTitle()) {
           $title = $conpherence->getTitle();
         }
         $cursor = $conpherence->getParticipant($user->getPHID());
         $data = $this->loadParticipationWithMidCursor($cursor);
         $all_participation = $data['participation'];
         $scroll_up_participant = $data['scroll_up_participant'];
         $scroll_down_participant = $data['scroll_down_participant'];
         break;
       case self::PAGING_MODE:
         $direction = $request->getStr('direction');
         $id = $request->getInt('participant_id');
         $date_touched = $request->getInt('date_touched');
         $conpherence_phid = $request->getStr('conpherence_phid');
         if ($direction == 'up') {
           $order = ConpherenceParticipantQuery::ORDER_NEWER;
         } else {
           $order = ConpherenceParticipantQuery::ORDER_OLDER;
         }
         $scroller_participant = id(new ConpherenceParticipant())
           ->makeEphemeral()
           ->setID($id)
           ->setDateTouched($date_touched)
           ->setConpherencePHID($conpherence_phid);
         $participation = id(new ConpherenceParticipantQuery())
           ->withParticipantPHIDs(array($user->getPHID()))
           ->withParticipantCursor($scroller_participant)
           ->setOrder($order)
           ->setLimit($too_many)
           ->execute();
         if (count($participation) == $too_many) {
           if ($direction == 'up') {
             $node = $scroll_up_participant = reset($participation);
           } else {
             $node = $scroll_down_participant = end($participation);
           }
           unset($participation[$node->getConpherencePHID()]);
         }
         $all_participation = $participation;
         break;
       case self::UNSELECTED_MODE:
       default:
         $too_many = ConpherenceParticipantQuery::LIMIT + 1;
         $all_participation = id(new ConpherenceParticipantQuery())
           ->withParticipantPHIDs(array($user->getPHID()))
           ->setLimit($too_many)
           ->execute();
         if (count($all_participation) == $too_many) {
           $node = end($participation);
           unset($all_participation[$node->getConpherencePHID()]);
           $scroll_down_participant = $node;
         }
         break;
     }
 
     $threads = $this->loadConpherenceThreadData(
       $all_participation);
 
     $thread_view = id(new ConpherenceThreadListView())
       ->setUser($user)
       ->setBaseURI($this->getApplicationURI())
       ->setThreads($threads)
       ->setScrollUpParticipant($scroll_up_participant)
       ->setScrollDownParticipant($scroll_down_participant);
 
     switch ($mode) {
       case self::SELECTED_MODE:
         $response = id(new AphrontAjaxResponse())->setContent($thread_view);
         break;
       case self::PAGING_MODE:
         $thread_html = $thread_view->renderThreadsHTML();
         $phids = array_keys($participation);
         $content = array(
           'html' => $thread_html,
           'phids' => $phids);
         $response = id(new AphrontAjaxResponse())->setContent($content);
         break;
       case self::UNSELECTED_MODE:
       default:
         $layout = id(new ConpherenceLayoutView())
           ->setBaseURI($this->getApplicationURI())
           ->setThreadView($thread_view)
           ->setRole('list');
         if ($conpherence) {
           $layout->setHeader($this->buildHeaderPaneContent($conpherence));
           $layout->setThread($conpherence);
         } else {
           $layout->setHeader(
             $this->buildHeaderPaneContent(
               id(new ConpherenceThread())
               ->makeEphemeral()));
         }
         $response = $this->buildApplicationPage(
           $layout,
           array(
             'title' => $title,
           ));
         break;
     }
 
     return $response;
 
   }
 
   /**
    * Handles the curious case when we are visiting a conpherence directly
    * by issuing two separate queries. Otherwise, additional conpherences
    * are fetched asynchronously. Note these can be earlier or later
    * (up or down), depending on what conpherence was selected on initial
    * load.
    */
   private function loadParticipationWithMidCursor(
     ConpherenceParticipant $cursor) {
 
     $user = $this->getRequest()->getUser();
 
     $scroll_up_participant = $this->getEmptyParticipant();
     $scroll_down_participant = $this->getEmptyParticipant();
 
     // Note this is a bit dodgy since there may be less than this
     // amount in either the up or down direction, thus having us fail
     // to fetch LIMIT in total. Whatevs for now and re-visit if we're
     // fine-tuning this loading process.
     $too_many = ceil(ConpherenceParticipantQuery::LIMIT / 2) + 1;
     $participant_query = id(new ConpherenceParticipantQuery())
       ->withParticipantPHIDs(array($user->getPHID()))
       ->setLimit($too_many);
     $current_selection_epoch = $cursor->getDateTouched();
     $set_one = $participant_query
       ->withParticipantCursor($cursor)
       ->setOrder(ConpherenceParticipantQuery::ORDER_NEWER)
       ->execute();
 
     if (count($set_one) == $too_many) {
       $node = reset($set_one);
       unset($set_one[$node->getConpherencePHID()]);
       $scroll_up_participant = $node;
     }
 
     $set_two = $participant_query
       ->withParticipantCursor($cursor)
       ->setOrder(ConpherenceParticipantQuery::ORDER_OLDER)
       ->execute();
 
     if (count($set_two) == $too_many) {
       $node = end($set_two);
       unset($set_two[$node->getConpherencePHID()]);
       $scroll_down_participant = $node;
     }
 
     $participation = array_merge(
       $set_one,
       $set_two);
 
     return array(
       'scroll_up_participant' => $scroll_up_participant,
       'scroll_down_participant' => $scroll_down_participant,
-      'participation' => $participation);
+      'participation' => $participation,
+    );
   }
 
   private function loadConpherenceThreadData($participation) {
     $user = $this->getRequest()->getUser();
     $conpherence_phids = array_keys($participation);
     $conpherences = array();
     if ($conpherence_phids) {
       $conpherences = id(new ConpherenceThreadQuery())
         ->setViewer($user)
         ->withPHIDs($conpherence_phids)
         ->needParticipantCache(true)
         ->execute();
 
       // this will re-sort by participation data
       $conpherences = array_select_keys($conpherences, $conpherence_phids);
     }
 
     return $conpherences;
   }
 
   private function getEmptyParticipant() {
     return id(new ConpherenceParticipant())
       ->makeEphemeral();
   }
 
 }
diff --git a/src/applications/conpherence/controller/ConpherenceNewController.php b/src/applications/conpherence/controller/ConpherenceNewController.php
index b2a3cdd4a7..f224de2a13 100644
--- a/src/applications/conpherence/controller/ConpherenceNewController.php
+++ b/src/applications/conpherence/controller/ConpherenceNewController.php
@@ -1,102 +1,100 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceNewController extends ConpherenceController {
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $title = pht('New Message');
     $participants = array();
     $participant_prefill = null;
     $message = '';
     $e_participants = null;
     $e_message = null;
 
     // this comes from ajax requests from all over. should be a single phid.
 
     if ($request->isFormPost()) {
       $participants = $request->getArr('participants');
       $message = $request->getStr('message');
       list($error_codes, $conpherence) = ConpherenceEditor::createConpherence(
         $user,
         $participants,
         $conpherence_title = null,
         $message,
         PhabricatorContentSource::newFromRequest($request));
 
       if ($error_codes) {
         foreach ($error_codes as $error_code) {
           switch ($error_code) {
             case ConpherenceEditor::ERROR_EMPTY_MESSAGE:
               $e_message = true;
               break;
             case ConpherenceEditor::ERROR_EMPTY_PARTICIPANTS:
               $e_participants = true;
               break;
           }
         }
       } else {
         $uri = $this->getApplicationURI($conpherence->getID());
         return id(new AphrontRedirectResponse())
           ->setURI($uri);
       }
     } else {
       $participant_prefill = $request->getStr('participant');
       if ($participant_prefill) {
         $participants[] = $participant_prefill;
       }
     }
 
 
     $participant_handles = array();
     if ($participants) {
       $participant_handles = id(new PhabricatorHandleQuery())
         ->setViewer($user)
         ->withPHIDs($participants)
         ->execute();
     }
 
     $submit_uri = $this->getApplicationURI('new/');
     $cancel_uri = $this->getApplicationURI();
 
     // TODO - we can get a better cancel_uri once we get better at crazy
     // ajax jonx T2086
     if ($participant_prefill) {
       $handle = $participant_handles[$participant_prefill];
       $cancel_uri = $handle->getURI();
     }
 
     $dialog = id(new AphrontDialogView())
       ->setWidth(AphrontDialogView::WIDTH_FORM)
       ->setUser($user)
       ->setTitle($title)
       ->addCancelButton($cancel_uri)
       ->addSubmitButton(pht('Send Message'));
 
     $form = id(new PHUIFormLayoutView())
       ->setUser($user)
       ->setFullWidth(true)
       ->appendChild(
         id(new AphrontFormTokenizerControl())
         ->setName('participants')
         ->setValue($participant_handles)
         ->setUser($user)
         ->setDatasource('/typeahead/common/users/')
         ->setLabel(pht('To'))
         ->setError($e_participants))
       ->appendChild(
         id(new PhabricatorRemarkupControl())
         ->setName('message')
         ->setValue($message)
         ->setLabel(pht('Message'))
         ->setError($e_message));
 
     $dialog->appendChild($form);
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
+
 }
diff --git a/src/applications/conpherence/controller/ConpherenceNotificationPanelController.php b/src/applications/conpherence/controller/ConpherenceNotificationPanelController.php
index 50ea0359e5..6201b04b21 100644
--- a/src/applications/conpherence/controller/ConpherenceNotificationPanelController.php
+++ b/src/applications/conpherence/controller/ConpherenceNotificationPanelController.php
@@ -1,111 +1,108 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceNotificationPanelController
   extends ConpherenceController {
 
   public function processRequest() {
-
     $request = $this->getRequest();
     $user = $request->getUser();
     $conpherences = array();
     $unread_status = ConpherenceParticipationStatus::BEHIND;
 
     $participant_data = id(new ConpherenceParticipantQuery())
       ->withParticipantPHIDs(array($user->getPHID()))
       ->setLimit(5)
       ->execute();
 
     if ($participant_data) {
       $conpherences = id(new ConpherenceThreadQuery())
         ->setViewer($user)
         ->withPHIDs(array_keys($participant_data))
         ->needParticipantCache(true)
         ->execute();
     }
 
     if ($conpherences) {
       require_celerity_resource('conpherence-notification-css');
       // re-order the conpherences based on participation data
       $conpherences = array_select_keys(
         $conpherences, array_keys($participant_data));
       $view = new AphrontNullView();
       foreach ($conpherences as $conpherence) {
         $p_data = $participant_data[$conpherence->getPHID()];
         $d_data = $conpherence->getDisplayData($user);
         $classes = array(
           'phabricator-notification',
           'conpherence-notification',
         );
 
         if ($p_data->getParticipationStatus() == $unread_status) {
           $classes[] = 'phabricator-notification-unread';
         }
         $uri = $this->getApplicationURI($conpherence->getID().'/');
         $title = $d_data['title'];
         $subtitle = $d_data['subtitle'];
         $unread_count = $d_data['unread_count'];
         $epoch = $d_data['epoch'];
         $image = $d_data['image'];
 
         $msg_view = id(new ConpherenceMenuItemView())
           ->setUser($user)
           ->setTitle($title)
           ->setSubtitle($subtitle)
           ->setHref($uri)
           ->setEpoch($epoch)
           ->setImageURI($image)
           ->setUnreadCount($unread_count);
 
         $view->appendChild(javelin_tag(
           'div',
           array(
             'class' => implode(' ', $classes),
             'sigil' => 'notification',
             'meta' => array(
               'href' => $uri,
             ),
           ),
           $msg_view));
       }
       $content = $view->render();
     } else {
       $content = phutil_tag_div(
         'phabricator-notification no-notifications',
         pht('You have no messages.'));
     }
 
     $content = hsprintf(
       '<div class="phabricator-notification-header">%s</div>'.
       '%s'.
       '<div class="phabricator-notification-view-all">%s</div>',
       phutil_tag(
         'a',
         array(
           'href' => '/conpherence/',
         ),
         pht('Messages')),
       $content,
       phutil_tag(
         'a',
         array(
           'href' => '/conpherence/',
         ),
         'View All Conpherences'));
 
     $unread = id(new ConpherenceParticipantCountQuery())
       ->withParticipantPHIDs(array($user->getPHID()))
       ->withParticipationStatus($unread_status)
       ->execute();
     $unread_count = idx($unread, $user->getPHID(), 0);
 
     $json = array(
       'content' => $content,
       'number'  => (int)$unread_count,
     );
 
     return id(new AphrontAjaxResponse())->setContent($json);
   }
+
 }
diff --git a/src/applications/conpherence/controller/ConpherenceWidgetController.php b/src/applications/conpherence/controller/ConpherenceWidgetController.php
index 8136ccba13..10c53b73cd 100644
--- a/src/applications/conpherence/controller/ConpherenceWidgetController.php
+++ b/src/applications/conpherence/controller/ConpherenceWidgetController.php
@@ -1,385 +1,384 @@
 <?php
 
-/**
- * @group conpherence
- */
-final class ConpherenceWidgetController extends
-  ConpherenceController {
+final class ConpherenceWidgetController extends ConpherenceController {
 
   private $conpherenceID;
   private $conpherence;
   private $userPreferences;
 
   public function setUserPreferences(PhabricatorUserPreferences $pref) {
     $this->userPreferences = $pref;
     return $this;
   }
+
   public function getUserPreferences() {
     return $this->userPreferences;
   }
 
   public function setConpherence(ConpherenceThread $conpherence) {
     $this->conpherence = $conpherence;
     return $this;
   }
+
   public function getConpherence() {
     return $this->conpherence;
   }
 
   public function setConpherenceID($conpherence_id) {
     $this->conpherenceID = $conpherence_id;
     return $this;
   }
+
   public function getConpherenceID() {
     return $this->conpherenceID;
   }
 
   public function willProcessRequest(array $data) {
     $this->setConpherenceID(idx($data, 'id'));
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $conpherence_id = $this->getConpherenceID();
     if (!$conpherence_id) {
       return new Aphront404Response();
     }
     $conpherence = id(new ConpherenceThreadQuery())
       ->setViewer($user)
       ->withIDs(array($conpherence_id))
       ->needWidgetData(true)
       ->executeOne();
     $this->setConpherence($conpherence);
 
     $this->setUserPreferences($user->loadPreferences());
 
     $widgets = $this->renderWidgetPaneContent();
     $content = $widgets;
     return id(new AphrontAjaxResponse())->setContent($content);
   }
 
   private function renderWidgetPaneContent() {
     require_celerity_resource('sprite-conpherence-css');
     $conpherence = $this->getConpherence();
 
     $widgets = array();
     $new_icon = id(new PHUIIconView())
       ->setIconFont('fa-plus')
       ->setHref($this->getWidgetURI())
       ->setMetadata(array('widget' => null))
       ->addSigil('conpherence-widget-adder');
     $widgets[] = phutil_tag(
       'div',
       array(
         'class' => 'widgets-header',
       ),
       id(new PHUIActionHeaderView())
       ->setHeaderColor(PHUIActionHeaderView::HEADER_GREY)
       ->setHeaderTitle(pht('Participants'))
       ->setHeaderHref('#')
       ->setDropdown(true)
       ->addAction($new_icon)
       ->addHeaderSigil('widgets-selector'));
     $user = $this->getRequest()->getUser();
     // now the widget bodies
     $widgets[] = javelin_tag(
       'div',
       array(
         'class' => 'widgets-body',
         'id' => 'widgets-people',
         'sigil' => 'widgets-people',
       ),
       id(new ConpherencePeopleWidgetView())
       ->setUser($user)
       ->setConpherence($conpherence)
       ->setUpdateURI($this->getWidgetURI()));
     $widgets[] = javelin_tag(
       'div',
       array(
         'class' => 'widgets-body',
         'id' => 'widgets-files',
         'sigil' => 'widgets-files',
         'style' => 'display: none;'
       ),
       id(new ConpherenceFileWidgetView())
       ->setUser($user)
       ->setConpherence($conpherence)
       ->setUpdateURI($this->getWidgetURI()));
     $widgets[] = phutil_tag(
       'div',
       array(
         'class' => 'widgets-body',
         'id' => 'widgets-calendar',
         'style' => 'display: none;'
       ),
       $this->renderCalendarWidgetPaneContent());
     $widgets[] = phutil_tag(
       'div',
       array(
         'class' => 'widgets-body',
         'id' => 'widgets-settings',
         'style' => 'display: none'
       ),
       $this->renderSettingsWidgetPaneContent());
 
     // without this implosion we get "," between each element in our widgets
     // array
     return array('widgets' => phutil_implode_html('', $widgets));
   }
 
   private function renderSettingsWidgetPaneContent() {
     $user = $this->getRequest()->getUser();
     $conpherence = $this->getConpherence();
     $participants = $conpherence->getParticipants();
     $participant = $participants[$user->getPHID()];
     $default = ConpherenceSettings::EMAIL_ALWAYS;
     $preference = $this->getUserPreferences();
     if ($preference) {
       $default = $preference->getPreference(
         PhabricatorUserPreferences::PREFERENCE_CONPH_NOTIFICATIONS,
         ConpherenceSettings::EMAIL_ALWAYS);
     }
     $settings = $participant->getSettings();
     $notifications = idx(
       $settings,
       'notifications',
       $default);
     $options = id(new AphrontFormRadioButtonControl())
       ->addButton(
         ConpherenceSettings::EMAIL_ALWAYS,
         ConpherenceSettings::getHumanString(
           ConpherenceSettings::EMAIL_ALWAYS),
         '')
       ->addButton(
         ConpherenceSettings::NOTIFICATIONS_ONLY,
         ConpherenceSettings::getHumanString(
           ConpherenceSettings::NOTIFICATIONS_ONLY),
         '')
       ->setName('notifications')
       ->setValue($notifications);
 
     $layout = array(
       $options,
       phutil_tag(
         'input',
         array(
           'type' => 'hidden',
           'name' => 'action',
           'value' => 'notifications'
         )),
       phutil_tag(
         'button',
         array(
           'type' => 'submit',
           'class' => 'notifications-update',
         ),
         pht('Save'))
     );
 
     return phabricator_form(
       $user,
       array(
         'method' => 'POST',
         'action' => $this->getWidgetURI(),
         'sigil' => 'notifications-update',
       ),
       $layout);
   }
 
   private function renderCalendarWidgetPaneContent() {
     $user = $this->getRequest()->getUser();
 
     $conpherence = $this->getConpherence();
     $participants = $conpherence->getParticipants();
     $widget_data = $conpherence->getWidgetData();
     $statuses = $widget_data['statuses'];
     $handles = $conpherence->getHandles();
     $content = array();
     $layout = id(new AphrontMultiColumnView())
       ->setFluidLayout(true);
     $timestamps = CalendarTimeUtil::getCalendarWidgetTimestamps($user);
     $today = $timestamps['today'];
     $epoch_stamps = $timestamps['epoch_stamps'];
     $one_day = 24 * 60 * 60;
     $is_today = false;
     $calendar_columns = 0;
     $list_days = 0;
     foreach ($epoch_stamps as $day) {
       // build a header for the new day
       if ($day->format('Ymd') == $today->format('Ymd')) {
         $active_class = 'today';
         $is_today = true;
       } else {
         $active_class = '';
         $is_today = false;
       }
 
       $should_draw_list = $list_days < 7;
       $list_days++;
 
       if ($should_draw_list) {
         $content[] = phutil_tag(
           'div',
           array(
             'class' => 'day-header '.$active_class
           ),
           array(
             phutil_tag(
               'div',
               array(
                 'class' => 'day-name'
               ),
               $day->format('l')),
             phutil_tag(
               'div',
               array(
                 'class' => 'day-date'
               ),
               $day->format('m/d/y'))));
       }
 
       $week_day_number = $day->format('w');
 
       $epoch_start = $day->format('U');
       $next_day = clone $day;
       $next_day->modify('+1 day');
       $epoch_end = $next_day->format('U');
 
       $first_status_of_the_day = true;
       $statuses_of_the_day = array();
       // keep looking through statuses where we last left off
       foreach ($statuses as $status) {
         if ($status->getDateFrom() >= $epoch_end) {
           // This list is sorted, so we can stop looking.
           break;
         }
 
         if ($status->getDateFrom() < $epoch_end &&
             $status->getDateTo() > $epoch_start) {
           $statuses_of_the_day[$status->getUserPHID()] = $status;
           if ($should_draw_list) {
             $top_border = '';
             if (!$first_status_of_the_day) {
               $top_border = ' top-border';
             }
             $timespan = $status->getDateTo() - $status->getDateFrom();
             if ($timespan > $one_day) {
               $time_str = 'm/d';
             } else {
               $time_str = 'h:i A';
             }
             $epoch_range =
               phabricator_format_local_time(
                 $status->getDateFrom(),
                 $user,
                 $time_str).
               ' - '.
               phabricator_format_local_time(
                 $status->getDateTo(),
                 $user,
                 $time_str);
 
             $secondary_info = pht('%s, %s',
               $handles[$status->getUserPHID()]->getName(), $epoch_range);
 
             $content[] = phutil_tag(
               'div',
               array(
                 'class' => 'user-status '.$status->getTextStatus().$top_border,
               ),
               array(
                 phutil_tag(
                   'div',
                   array(
                     'class' => 'icon',
                   ),
                   ''),
                 phutil_tag(
                   'div',
                   array(
                     'class' => 'description'
                   ),
                   array(
                     $status->getTerseSummary($user),
                     phutil_tag(
                       'div',
                       array(
                         'class' => 'participant'
                       ),
                       $secondary_info)))));
           }
           $first_status_of_the_day = false;
         }
       }
 
       // we didn't get a status on this day so add a spacer
       if ($first_status_of_the_day && $should_draw_list) {
         $content[] = phutil_tag(
           'div',
           array('class' => 'no-events pm'),
           pht('No Events Scheduled.'));
       }
       if ($is_today || ($calendar_columns && $calendar_columns < 3)) {
         $active_class = '';
         if ($is_today) {
           $active_class = '-active';
         }
         $inner_layout = array();
         foreach ($participants as $phid => $participant) {
           $status = idx($statuses_of_the_day, $phid, false);
           if ($status) {
             $inner_layout[] = phutil_tag(
               'div',
               array(
                 'class' => $status->getTextStatus()
               ),
               '');
           } else {
             $inner_layout[] = phutil_tag(
               'div',
               array(
                 'class' => 'present'
               ),
               '');
           }
         }
         $layout->addColumn(
           phutil_tag(
             'div',
             array(
               'class' => 'day-column'.$active_class
             ),
             array(
               phutil_tag(
                 'div',
                 array(
                   'class' => 'day-name'
                 ),
                 $day->format('D')),
               phutil_tag(
                 'div',
                 array(
                   'class' => 'day-number',
                 ),
                 $day->format('j')),
               $inner_layout
             )));
         $calendar_columns++;
       }
     }
 
     return
       array(
         $layout,
         $content
       );
   }
 
   private function getWidgetURI() {
     $conpherence = $this->getConpherence();
     return $this->getApplicationURI('update/'.$conpherence->getID().'/');
   }
 
 }
diff --git a/src/applications/conpherence/editor/ConpherenceEditor.php b/src/applications/conpherence/editor/ConpherenceEditor.php
index e1894c92ee..8389995b5c 100644
--- a/src/applications/conpherence/editor/ConpherenceEditor.php
+++ b/src/applications/conpherence/editor/ConpherenceEditor.php
@@ -1,424 +1,422 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceEditor extends PhabricatorApplicationTransactionEditor {
 
   const ERROR_EMPTY_PARTICIPANTS = 'error-empty-participants';
   const ERROR_EMPTY_MESSAGE = 'error-empty-message';
 
   public static function createConpherence(
     PhabricatorUser $creator,
     array $participant_phids,
     $title,
     $message,
     PhabricatorContentSource $source) {
 
     $conpherence = id(new ConpherenceThread())
       ->attachParticipants(array())
       ->attachFilePHIDs(array())
       ->setMessageCount(0);
     $files = array();
     $errors = array();
     if (empty($participant_phids)) {
       $errors[] = self::ERROR_EMPTY_PARTICIPANTS;
     } else {
       $participant_phids[] = $creator->getPHID();
       $participant_phids = array_unique($participant_phids);
       $conpherence->setRecentParticipantPHIDs(
         array_slice($participant_phids, 0, 10));
     }
 
     if (empty($message)) {
       $errors[] = self::ERROR_EMPTY_MESSAGE;
     }
 
     $file_phids = PhabricatorMarkupEngine::extractFilePHIDsFromEmbeddedFiles(
       $creator,
       array($message));
     if ($file_phids) {
       $files = id(new PhabricatorFileQuery())
         ->setViewer($creator)
         ->withPHIDs($file_phids)
         ->execute();
     }
 
     if (!$errors) {
       $xactions = array();
       $xactions[] = id(new ConpherenceTransaction())
         ->setTransactionType(ConpherenceTransactionType::TYPE_PARTICIPANTS)
         ->setNewValue(array('+' => $participant_phids));
       if ($files) {
         $xactions[] = id(new ConpherenceTransaction())
           ->setTransactionType(ConpherenceTransactionType::TYPE_FILES)
           ->setNewValue(array('+' => mpull($files, 'getPHID')));
       }
       if ($title) {
         $xactions[] = id(new ConpherenceTransaction())
           ->setTransactionType(ConpherenceTransactionType::TYPE_TITLE)
           ->setNewValue($title);
       }
       $xactions[] = id(new ConpherenceTransaction())
         ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
         ->attachComment(
           id(new ConpherenceTransactionComment())
           ->setContent($message)
           ->setConpherencePHID($conpherence->getPHID()));
 
       id(new ConpherenceEditor())
         ->setContentSource($source)
         ->setContinueOnNoEffect(true)
         ->setActor($creator)
         ->applyTransactions($conpherence, $xactions);
 
     }
 
     return array($errors, $conpherence);
   }
 
   public function generateTransactionsFromText(
     PhabricatorUser $viewer,
     ConpherenceThread $conpherence,
     $text) {
 
     $files = array();
     $file_phids = PhabricatorMarkupEngine::extractFilePHIDsFromEmbeddedFiles(
       $viewer,
       array($text));
     // Since these are extracted from text, we might be re-including the
     // same file -- e.g. a mock under discussion. Filter files we
     // already have.
     $existing_file_phids = $conpherence->getFilePHIDs();
     $file_phids = array_diff($file_phids, $existing_file_phids);
     if ($file_phids) {
       $files = id(new PhabricatorFileQuery())
         ->setViewer($this->getActor())
         ->withPHIDs($file_phids)
         ->execute();
     }
     $xactions = array();
     if ($files) {
       $xactions[] = id(new ConpherenceTransaction())
         ->setTransactionType(ConpherenceTransactionType::TYPE_FILES)
         ->setNewValue(array('+' => mpull($files, 'getPHID')));
     }
     $xactions[] = id(new ConpherenceTransaction())
       ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
       ->attachComment(
         id(new ConpherenceTransactionComment())
         ->setContent($text)
         ->setConpherencePHID($conpherence->getPHID()));
     return $xactions;
   }
 
   public function getTransactionTypes() {
     $types = parent::getTransactionTypes();
 
     $types[] = PhabricatorTransactions::TYPE_COMMENT;
 
     $types[] = ConpherenceTransactionType::TYPE_TITLE;
     $types[] = ConpherenceTransactionType::TYPE_PARTICIPANTS;
     $types[] = ConpherenceTransactionType::TYPE_FILES;
 
     return $types;
   }
 
   protected function getCustomTransactionOldValue(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case ConpherenceTransactionType::TYPE_TITLE:
         return $object->getTitle();
       case ConpherenceTransactionType::TYPE_PARTICIPANTS:
         return $object->getParticipantPHIDs();
       case ConpherenceTransactionType::TYPE_FILES:
         return $object->getFilePHIDs();
     }
   }
 
   protected function getCustomTransactionNewValue(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case ConpherenceTransactionType::TYPE_TITLE:
         return $xaction->getNewValue();
       case ConpherenceTransactionType::TYPE_PARTICIPANTS:
       case ConpherenceTransactionType::TYPE_FILES:
         return $this->getPHIDTransactionNewValue($xaction);
     }
   }
 
   /**
    * We really only need a read lock if we have a comment. In that case, we
    * must update the messagesCount field on the conpherence and
    * seenMessagesCount(s) for the participant(s).
    */
   protected function shouldReadLock(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     $lock = false;
     switch ($xaction->getTransactionType()) {
       case PhabricatorTransactions::TYPE_COMMENT:
         $lock =  true;
         break;
     }
 
     return $lock;
   }
 
   /**
    * We need to apply initial effects IFF the conpherence is new. We must
    * save the conpherence first thing to make sure we have an id and a phid.
    */
   protected function shouldApplyInitialEffects(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     return !$object->getID();
   }
 
   protected function applyInitialEffects(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $object->save();
   }
 
   protected function applyCustomInternalTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
     switch ($xaction->getTransactionType()) {
       case PhabricatorTransactions::TYPE_COMMENT:
         $object->setMessageCount((int)$object->getMessageCount() + 1);
         break;
       case ConpherenceTransactionType::TYPE_TITLE:
         $object->setTitle($xaction->getNewValue());
         break;
     }
     $this->updateRecentParticipantPHIDs($object, $xaction);
   }
 
   private function updateRecentParticipantPHIDs(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     $participants = $object->getRecentParticipantPHIDs();
     array_unshift($participants, $xaction->getAuthorPHID());
     $participants = array_slice(array_unique($participants), 0, 10);
 
     $object->setRecentParticipantPHIDs($participants);
   }
 
   protected function applyCustomExternalTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case ConpherenceTransactionType::TYPE_FILES:
         $editor = id(new PhabricatorEdgeEditor())
           ->setActor($this->getActor());
         $edge_type = PhabricatorEdgeConfig::TYPE_OBJECT_HAS_FILE;
         $old = array_fill_keys($xaction->getOldValue(), true);
         $new = array_fill_keys($xaction->getNewValue(), true);
         $add_edges = array_keys(array_diff_key($new, $old));
         $remove_edges = array_keys(array_diff_key($old, $new));
         foreach ($add_edges as $file_phid) {
           $editor->addEdge(
             $object->getPHID(),
             $edge_type,
             $file_phid);
         }
         foreach ($remove_edges as $file_phid) {
           $editor->removeEdge(
             $object->getPHID(),
             $edge_type,
             $file_phid);
         }
         $editor->save();
         break;
       case ConpherenceTransactionType::TYPE_PARTICIPANTS:
         $participants = $object->getParticipants();
 
         $old_map = array_fuse($xaction->getOldValue());
         $new_map = array_fuse($xaction->getNewValue());
 
         $remove = array_keys(array_diff_key($old_map, $new_map));
         foreach ($remove as $phid) {
           $remove_participant = $participants[$phid];
           $remove_participant->delete();
           unset($participants[$phid]);
         }
 
         $add = array_keys(array_diff_key($new_map, $old_map));
         foreach ($add as $phid) {
           if ($phid == $this->getActor()->getPHID()) {
             $status = ConpherenceParticipationStatus::UP_TO_DATE;
             $message_count = $object->getMessageCount();
           } else {
             $status = ConpherenceParticipationStatus::BEHIND;
             $message_count = 0;
           }
           $participants[$phid] =
             id(new ConpherenceParticipant())
             ->setConpherencePHID($object->getPHID())
             ->setParticipantPHID($phid)
             ->setParticipationStatus($status)
             ->setDateTouched(time())
             ->setBehindTransactionPHID($xaction->getPHID())
             ->setSeenMessageCount($message_count)
             ->save();
         }
         $object->attachParticipants($participants);
         break;
     }
   }
 
   protected function applyFinalEffects(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     // update everyone's participation status on the last xaction -only-
     $xaction = end($xactions);
     $xaction_phid = $xaction->getPHID();
     $behind = ConpherenceParticipationStatus::BEHIND;
     $up_to_date = ConpherenceParticipationStatus::UP_TO_DATE;
     $participants = $object->getParticipants();
     $user = $this->getActor();
     $time = time();
     foreach ($participants as $phid => $participant) {
       if ($phid != $user->getPHID()) {
         if ($participant->getParticipationStatus() != $behind) {
           $participant->setBehindTransactionPHID($xaction_phid);
           // decrement one as this is the message putting them behind!
           $participant->setSeenMessageCount($object->getMessageCount() - 1);
         }
         $participant->setParticipationStatus($behind);
         $participant->setDateTouched($time);
       } else {
         $participant->setSeenMessageCount($object->getMessageCount());
         $participant->setParticipationStatus($up_to_date);
         $participant->setDateTouched($time);
       }
       $participant->save();
     }
 
     if ($xactions) {
       $data = array(
         'type'        => 'message',
         'threadPHID'  => $object->getPHID(),
         'messageID'   => last($xactions)->getID(),
         'subscribers' => array($object->getPHID()),
       );
 
       PhabricatorNotificationClient::tryToPostMessage($data);
     }
 
     return $xactions;
   }
 
   protected function mergeTransactions(
     PhabricatorApplicationTransaction $u,
     PhabricatorApplicationTransaction $v) {
 
     $type = $u->getTransactionType();
     switch ($type) {
       case ConpherenceTransactionType::TYPE_TITLE:
         return $v;
       case ConpherenceTransactionType::TYPE_FILES:
       case ConpherenceTransactionType::TYPE_PARTICIPANTS:
         return $this->mergePHIDOrEdgeTransactions($u, $v);
     }
 
     return parent::mergeTransactions($u, $v);
   }
 
   protected function shouldSendMail(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return true;
   }
 
   protected function buildReplyHandler(PhabricatorLiskDAO $object) {
     return id(new ConpherenceReplyHandler())
       ->setActor($this->getActor())
       ->setMailReceiver($object);
   }
 
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $id = $object->getID();
     $title = $object->getTitle();
     if (!$title) {
       $title = pht(
         '%s sent you a message.',
         $this->getActor()->getUserName());
     }
     $phid = $object->getPHID();
 
     return id(new PhabricatorMetaMTAMail())
       ->setSubject("E{$id}: {$title}")
       ->addHeader('Thread-Topic', "E{$id}: {$phid}");
   }
 
   protected function getMailTo(PhabricatorLiskDAO $object) {
     $to_phids = array();
     $participants = $object->getParticipants();
     if (empty($participants)) {
       return $to_phids;
     }
     $preferences = id(new PhabricatorUserPreferences())
       ->loadAllWhere('userPHID in (%Ls)', array_keys($participants));
     $preferences = mpull($preferences, null, 'getUserPHID');
     foreach ($participants as $phid => $participant) {
       $default = ConpherenceSettings::EMAIL_ALWAYS;
       $preference = idx($preferences, $phid);
       if ($preference) {
         $default = $preference->getPreference(
           PhabricatorUserPreferences::PREFERENCE_CONPH_NOTIFICATIONS,
           ConpherenceSettings::EMAIL_ALWAYS);
       }
       $settings = $participant->getSettings();
       $notifications = idx(
         $settings,
         'notifications',
         $default);
       if ($notifications == ConpherenceSettings::EMAIL_ALWAYS) {
         $to_phids[] = $phid;
       }
     }
     return $to_phids;
   }
 
   protected function getMailCC(PhabricatorLiskDAO $object) {
     return array();
   }
 
   protected function buildMailBody(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $body = parent::buildMailBody($object, $xactions);
     $body->addTextSection(
       pht('CONPHERENCE DETAIL'),
       PhabricatorEnv::getProductionURI('/conpherence/'.$object->getID().'/'));
 
     return $body;
   }
 
   protected function getMailSubjectPrefix() {
     return PhabricatorEnv::getEnvConfig('metamta.conpherence.subject-prefix');
   }
 
   protected function shouldPublishFeedStory(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return false;
   }
 
   protected function supportsSearch() {
     return false;
   }
+
 }
diff --git a/src/applications/conpherence/phid/PhabricatorConpherencePHIDTypeThread.php b/src/applications/conpherence/phid/PhabricatorConpherencePHIDTypeThread.php
index fd94da83a9..3a6319a954 100644
--- a/src/applications/conpherence/phid/PhabricatorConpherencePHIDTypeThread.php
+++ b/src/applications/conpherence/phid/PhabricatorConpherencePHIDTypeThread.php
@@ -1,47 +1,44 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class PhabricatorConpherencePHIDTypeThread extends PhabricatorPHIDType {
 
   const TYPECONST = 'CONP';
 
   public function getTypeConstant() {
     return self::TYPECONST;
   }
 
   public function getTypeName() {
     return pht('Conpherence Thread');
   }
 
   public function newObject() {
     return new ConpherenceThread();
   }
 
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new ConpherenceThreadQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $thread = $objects[$phid];
       $name = $thread->getTitle();
       if (!strlen($name)) {
         $name = pht('[No Title]');
       }
       $handle->setName($name);
       $handle->setFullName($name);
       $handle->setURI('/conpherence/'.$thread->getID().'/');
     }
   }
 
 }
diff --git a/src/applications/conpherence/query/ConpherenceParticipantCountQuery.php b/src/applications/conpherence/query/ConpherenceParticipantCountQuery.php
index c74ff62b47..1d0cb81f8c 100644
--- a/src/applications/conpherence/query/ConpherenceParticipantCountQuery.php
+++ b/src/applications/conpherence/query/ConpherenceParticipantCountQuery.php
@@ -1,76 +1,73 @@
 <?php
 
 /**
  * Query class that answers the question:
  *
  * - Q: How many unread conpherences am I participating in?
  * - A:
  *     id(new ConpherenceParticipantCountQuery())
  *     ->withParticipantPHIDs(array($my_phid))
  *     ->withParticipationStatus(ConpherenceParticipationStatus::BEHIND)
  *     ->execute();
- *
- * @group conpherence
  */
 final class ConpherenceParticipantCountQuery
   extends PhabricatorOffsetPagedQuery {
 
   private $participantPHIDs;
   private $participationStatus;
 
   public function withParticipantPHIDs(array $phids) {
     $this->participantPHIDs = $phids;
     return $this;
   }
 
   public function withParticipationStatus($participation_status) {
     $this->participationStatus = $participation_status;
     return $this;
   }
 
   public function execute() {
     $table = new ConpherenceParticipant();
     $conn_r = $table->establishConnection('r');
 
     $rows = queryfx_all(
       $conn_r,
       'SELECT COUNT(*) as count, participantPHID '.
       'FROM %T participant %Q %Q %Q',
       $table->getTableName(),
       $this->buildWhereClause($conn_r),
       $this->buildGroupByClause($conn_r),
       $this->buildLimitClause($conn_r));
 
     return ipull($rows, 'count', 'participantPHID');
   }
 
   private function buildWhereClause($conn_r) {
     $where = array();
 
     if ($this->participantPHIDs) {
       $where[] = qsprintf(
         $conn_r,
         'participantPHID IN (%Ls)',
         $this->participantPHIDs);
     }
 
     if ($this->participationStatus !== null) {
       $where[] = qsprintf(
         $conn_r,
         'participationStatus = %d',
         $this->participationStatus);
     }
 
     return $this->formatWhereClause($where);
   }
 
   private function buildGroupByClause(AphrontDatabaseConnection $conn_r) {
-
     $group_by = qsprintf(
       $conn_r,
       'GROUP BY participantPHID');
 
     return $group_by;
   }
 
 }
diff --git a/src/applications/conpherence/query/ConpherenceParticipantQuery.php b/src/applications/conpherence/query/ConpherenceParticipantQuery.php
index b755a30388..f9c31deed6 100644
--- a/src/applications/conpherence/query/ConpherenceParticipantQuery.php
+++ b/src/applications/conpherence/query/ConpherenceParticipantQuery.php
@@ -1,132 +1,128 @@
 <?php
 
 /**
  * Query class that answers these questions:
  *
  * - Q: What are the conpherences to show when I land on /conpherence/ ?
  * - A:
  *
  *     id(new ConpherenceParticipantQuery())
  *     ->withParticipantPHIDs(array($my_phid))
  *     ->execute();
  *
  * - Q: What are the next set of conpherences as I scroll up (more recent) or
  *      down (less recent) this list of conpherences?
  * - A:
  *
  *     id(new ConpherenceParticipantQuery())
  *     ->withParticipantPHIDs(array($my_phid))
  *     ->withParticipantCursor($top_participant)
  *     ->setOrder(ConpherenceParticipantQuery::ORDER_NEWER)
  *     ->execute();
  *
  *     -or-
  *
  *     id(new ConpherenceParticipantQuery())
  *     ->withParticipantPHIDs(array($my_phid))
  *     ->withParticipantCursor($bottom_participant)
  *     ->setOrder(ConpherenceParticipantQuery::ORDER_OLDER)
  *     ->execute();
  *
  * For counts of read, un-read, or all conpherences by participant, see
  * @{class:ConpherenceParticipantCountQuery}.
- *
- * @group conpherence
  */
-final class ConpherenceParticipantQuery
-  extends PhabricatorOffsetPagedQuery {
+final class ConpherenceParticipantQuery extends PhabricatorOffsetPagedQuery {
 
   const LIMIT = 100;
   const ORDER_NEWER = 'newer';
   const ORDER_OLDER = 'older';
 
   private $participantPHIDs;
   private $participantCursor;
   private $order = self::ORDER_OLDER;
 
   public function withParticipantPHIDs(array $phids) {
     $this->participantPHIDs = $phids;
     return $this;
   }
 
   public function withParticipantCursor(ConpherenceParticipant $participant) {
     $this->participantCursor = $participant;
     return $this;
   }
 
   public function setOrder($order) {
     $this->order = $order;
     return $this;
   }
 
   public function execute() {
     $table = new ConpherenceParticipant();
     $conn_r = $table->establishConnection('r');
 
     $data = queryfx_all(
       $conn_r,
       'SELECT * FROM %T participant %Q %Q %Q',
       $table->getTableName(),
       $this->buildWhereClause($conn_r),
       $this->buildOrderClause($conn_r),
       $this->buildLimitClause($conn_r));
 
     $participants = $table->loadAllFromArray($data);
 
     $participants = mpull($participants, null, 'getConpherencePHID');
 
     if ($this->order == self::ORDER_NEWER) {
       $participants = array_reverse($participants);
     }
 
     return $participants;
   }
 
   private function buildWhereClause($conn_r) {
     $where = array();
 
     if ($this->participantPHIDs) {
       $where[] = qsprintf(
         $conn_r,
         'participantPHID IN (%Ls)',
         $this->participantPHIDs);
     }
 
     if ($this->participantCursor) {
       $date_touched = $this->participantCursor->getDateTouched();
       $id = $this->participantCursor->getID();
       if ($this->order == self::ORDER_OLDER) {
         $compare_date = '<';
         $compare_id = '<=';
       } else {
         $compare_date = '>';
         $compare_id = '>=';
       }
       $where[] = qsprintf(
         $conn_r,
         '(dateTouched %Q %d OR (dateTouched = %d AND id %Q %d))',
         $compare_date,
         $date_touched,
         $date_touched,
         $compare_id,
         $id);
     }
 
     return $this->formatWhereClause($where);
   }
 
   private function buildOrderClause(AphrontDatabaseConnection $conn_r) {
-
     $order_word = ($this->order == self::ORDER_OLDER) ? 'DESC' : 'ASC';
     // if these are different direction we won't get as efficient a query
     // see http://dev.mysql.com/doc/refman/5.5/en/order-by-optimization.html
     $order = qsprintf(
       $conn_r,
       'ORDER BY dateTouched %Q, id %Q',
       $order_word,
       $order_word);
 
     return $order;
   }
 
 }
diff --git a/src/applications/conpherence/query/ConpherenceThreadQuery.php b/src/applications/conpherence/query/ConpherenceThreadQuery.php
index 984efa5ba3..239b7245e4 100644
--- a/src/applications/conpherence/query/ConpherenceThreadQuery.php
+++ b/src/applications/conpherence/query/ConpherenceThreadQuery.php
@@ -1,297 +1,294 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceThreadQuery
   extends PhabricatorCursorPagedPolicyAwareQuery {
 
   const TRANSACTION_LIMIT = 100;
 
   private $phids;
   private $ids;
   private $needWidgetData;
   private $needTransactions;
   private $needParticipantCache;
   private $needFilePHIDs;
   private $afterTransactionID;
   private $beforeTransactionID;
   private $transactionLimit;
 
   public function needFilePHIDs($need_file_phids) {
     $this->needFilePHIDs = $need_file_phids;
     return $this;
   }
 
   public function needParticipantCache($participant_cache) {
     $this->needParticipantCache = $participant_cache;
     return $this;
   }
 
   public function needWidgetData($need_widget_data) {
     $this->needWidgetData = $need_widget_data;
     return $this;
   }
 
   public function needTransactions($need_transactions) {
     $this->needTransactions = $need_transactions;
     return $this;
   }
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
     return $this;
   }
 
   public function withPHIDs(array $phids) {
     $this->phids = $phids;
     return $this;
   }
 
   public function setAfterTransactionID($id) {
     $this->afterTransactionID = $id;
     return $this;
   }
 
   public function setBeforeTransactionID($id) {
     $this->beforeTransactionID = $id;
     return $this;
   }
 
   public function setTransactionLimit($transaction_limit) {
     $this->transactionLimit = $transaction_limit;
     return $this;
   }
 
   public function getTransactionLimit() {
     return $this->transactionLimit;
   }
 
   protected function loadPage() {
     $table = new ConpherenceThread();
     $conn_r = $table->establishConnection('r');
 
     $data = queryfx_all(
       $conn_r,
       'SELECT conpherence_thread.* FROM %T conpherence_thread %Q %Q %Q',
       $table->getTableName(),
       $this->buildWhereClause($conn_r),
       $this->buildOrderClause($conn_r),
       $this->buildLimitClause($conn_r));
 
     $conpherences = $table->loadAllFromArray($data);
 
     if ($conpherences) {
       $conpherences = mpull($conpherences, null, 'getPHID');
       $this->loadParticipantsAndInitHandles($conpherences);
       if ($this->needParticipantCache) {
         $this->loadCoreHandles($conpherences, 'getRecentParticipantPHIDs');
       } else if ($this->needWidgetData) {
         $this->loadCoreHandles($conpherences, 'getParticipantPHIDs');
       }
       if ($this->needTransactions) {
         $this->loadTransactionsAndHandles($conpherences);
       }
       if ($this->needFilePHIDs || $this->needWidgetData) {
         $this->loadFilePHIDs($conpherences);
       }
       if ($this->needWidgetData) {
         $this->loadWidgetData($conpherences);
       }
     }
 
     return $conpherences;
   }
 
   protected function buildWhereClause($conn_r) {
     $where = array();
 
     $where[] = $this->buildPagingClause($conn_r);
 
     if ($this->ids) {
       $where[] = qsprintf(
         $conn_r,
         'id IN (%Ld)',
         $this->ids);
     }
 
     if ($this->phids) {
       $where[] = qsprintf(
         $conn_r,
         'phid IN (%Ls)',
         $this->phids);
     }
 
     return $this->formatWhereClause($where);
   }
 
   private function loadParticipantsAndInitHandles(array $conpherences) {
     $participants = id(new ConpherenceParticipant())
       ->loadAllWhere('conpherencePHID IN (%Ls)', array_keys($conpherences));
     $map = mgroup($participants, 'getConpherencePHID');
 
     foreach ($conpherences as $current_conpherence) {
       $conpherence_phid = $current_conpherence->getPHID();
 
       $conpherence_participants = idx(
         $map,
         $conpherence_phid,
         array());
 
       $conpherence_participants = mpull(
         $conpherence_participants,
         null,
         'getParticipantPHID');
 
       $current_conpherence->attachParticipants($conpherence_participants);
       $current_conpherence->attachHandles(array());
     }
 
     return $this;
   }
 
   private function loadCoreHandles(
     array $conpherences,
     $method) {
 
     $handle_phids = array();
     foreach ($conpherences as $conpherence) {
       $handle_phids[$conpherence->getPHID()] =
         $conpherence->$method();
     }
     $flat_phids = array_mergev($handle_phids);
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($this->getViewer())
       ->withPHIDs($flat_phids)
       ->execute();
     foreach ($handle_phids as $conpherence_phid => $phids) {
       $conpherence = $conpherences[$conpherence_phid];
       $conpherence->attachHandles(array_select_keys($handles, $phids));
     }
     return $this;
   }
 
   private function loadTransactionsAndHandles(array $conpherences) {
     $query = id(new ConpherenceTransactionQuery())
       ->setViewer($this->getViewer())
       ->withObjectPHIDs(array_keys($conpherences))
       ->needHandles(true);
 
     // We have to flip these for the underyling query class. The semantics of
     // paging are tricky business.
     if ($this->afterTransactionID) {
       $query->setBeforeID($this->afterTransactionID);
     } else if ($this->beforeTransactionID) {
       $query->setAfterID($this->beforeTransactionID);
     }
     if ($this->getTransactionLimit()) {
       // fetch an extra for "show older" scenarios
       $query->setLimit($this->getTransactionLimit() + 1);
     }
     $transactions = $query->execute();
     $transactions = mgroup($transactions, 'getObjectPHID');
     foreach ($conpherences as $phid => $conpherence) {
       $current_transactions = idx($transactions, $phid, array());
       $handles = array();
       foreach ($current_transactions as $transaction) {
         $handles += $transaction->getHandles();
       }
       $conpherence->attachHandles($conpherence->getHandles() + $handles);
       $conpherence->attachTransactions($current_transactions);
     }
     return $this;
   }
 
   private function loadFilePHIDs(array $conpherences) {
     $edge_type = PhabricatorEdgeConfig::TYPE_OBJECT_HAS_FILE;
     $file_edges = id(new PhabricatorEdgeQuery())
       ->withSourcePHIDs(array_keys($conpherences))
       ->withEdgeTypes(array($edge_type))
       ->execute();
     foreach ($file_edges as $conpherence_phid => $data) {
       $conpherence = $conpherences[$conpherence_phid];
       $conpherence->attachFilePHIDs(array_keys($data[$edge_type]));
     }
     return $this;
   }
 
   private function loadWidgetData(array $conpherences) {
     $participant_phids = array();
     $file_phids = array();
     foreach ($conpherences as $conpherence) {
       $participant_phids[] = array_keys($conpherence->getParticipants());
       $file_phids[] = $conpherence->getFilePHIDs();
     }
     $participant_phids = array_mergev($participant_phids);
     $file_phids = array_mergev($file_phids);
 
     $epochs = CalendarTimeUtil::getCalendarEventEpochs(
       $this->getViewer());
     $start_epoch = $epochs['start_epoch'];
     $end_epoch = $epochs['end_epoch'];
     $statuses = id(new PhabricatorCalendarEventQuery())
       ->setViewer($this->getViewer())
       ->withInvitedPHIDs($participant_phids)
       ->withDateRange($start_epoch, $end_epoch)
       ->execute();
 
     $statuses = mgroup($statuses, 'getUserPHID');
 
     // attached files
     $files = array();
     $file_author_phids = array();
     $authors = array();
     if ($file_phids) {
       $files = id(new PhabricatorFileQuery())
         ->setViewer($this->getViewer())
         ->withPHIDs($file_phids)
         ->execute();
       $files = mpull($files, null, 'getPHID');
       $file_author_phids = mpull($files, 'getAuthorPHID', 'getPHID');
       $authors = id(new PhabricatorHandleQuery())
         ->setViewer($this->getViewer())
         ->withPHIDs($file_author_phids)
         ->execute();
       $authors = mpull($authors, null, 'getPHID');
     }
 
     foreach ($conpherences as $phid => $conpherence) {
       $participant_phids = array_keys($conpherence->getParticipants());
       $statuses = array_select_keys($statuses, $participant_phids);
       $statuses = array_mergev($statuses);
       $statuses = msort($statuses, 'getDateFrom');
 
       $conpherence_files = array();
       $files_authors = array();
       foreach ($conpherence->getFilePHIDs() as $curr_phid) {
         $curr_file = idx($files, $curr_phid);
         if (!$curr_file) {
           // this file was deleted or user doesn't have permission to see it
           // this is generally weird
           continue;
         }
         $conpherence_files[$curr_phid] = $curr_file;
         // some files don't have authors so be careful
         $current_author = null;
         $current_author_phid = idx($file_author_phids, $curr_phid);
         if ($current_author_phid) {
           $current_author = $authors[$current_author_phid];
         }
         $files_authors[$curr_phid] = $current_author;
       }
       $widget_data = array(
         'statuses' => $statuses,
         'files' => $conpherence_files,
         'files_authors' => $files_authors
       );
       $conpherence->attachWidgetData($widget_data);
     }
 
     return $this;
   }
 
   public function getQueryApplicationClass() {
     return 'PhabricatorApplicationConpherence';
   }
 
 }
diff --git a/src/applications/conpherence/query/ConpherenceTransactionQuery.php b/src/applications/conpherence/query/ConpherenceTransactionQuery.php
index f07f536d4d..aa2408d025 100644
--- a/src/applications/conpherence/query/ConpherenceTransactionQuery.php
+++ b/src/applications/conpherence/query/ConpherenceTransactionQuery.php
@@ -1,18 +1,14 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceTransactionQuery
   extends PhabricatorApplicationTransactionQuery {
 
   public function getTemplateApplicationTransaction() {
     return new ConpherenceTransaction();
   }
 
   protected function getReversePaging() {
     return false;
   }
 
-
 }
diff --git a/src/applications/conpherence/storage/ConpherenceDAO.php b/src/applications/conpherence/storage/ConpherenceDAO.php
index 412c495b66..f8da94aae8 100644
--- a/src/applications/conpherence/storage/ConpherenceDAO.php
+++ b/src/applications/conpherence/storage/ConpherenceDAO.php
@@ -1,12 +1,9 @@
 <?php
 
-/**
- * @group conpherence
- */
 abstract class ConpherenceDAO extends PhabricatorLiskDAO {
 
   public function getApplicationName() {
     return 'conpherence';
   }
 
 }
diff --git a/src/applications/conpherence/storage/ConpherenceParticipant.php b/src/applications/conpherence/storage/ConpherenceParticipant.php
index 119d6e5cc8..66e57d4a1b 100644
--- a/src/applications/conpherence/storage/ConpherenceParticipant.php
+++ b/src/applications/conpherence/storage/ConpherenceParticipant.php
@@ -1,48 +1,45 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceParticipant extends ConpherenceDAO {
 
   protected $participantPHID;
   protected $conpherencePHID;
   protected $participationStatus;
   protected $behindTransactionPHID;
   protected $seenMessageCount;
   protected $dateTouched;
   protected $settings = array();
 
   public function getConfiguration() {
     return array(
       self::CONFIG_SERIALIZATION => array(
         'settings' => self::SERIALIZATION_JSON,
       ),
     ) + parent::getConfiguration();
   }
 
   public function getSettings() {
     return nonempty($this->settings, array());
   }
 
   public function markUpToDate(
     ConpherenceThread $conpherence,
     ConpherenceTransaction $xaction) {
     if (!$this->isUpToDate($conpherence)) {
       $this->setParticipationStatus(ConpherenceParticipationStatus::UP_TO_DATE);
       $this->setBehindTransactionPHID($xaction->getPHID());
       $this->setSeenMessageCount($conpherence->getMessageCount());
       $this->save();
     }
     return $this;
   }
 
   private function isUpToDate(ConpherenceThread $conpherence) {
     return
       ($this->getSeenMessageCount() == $conpherence->getMessageCount())
         &&
       ($this->getParticipationStatus() ==
        ConpherenceParticipationStatus::UP_TO_DATE);
   }
 
 }
diff --git a/src/applications/conpherence/storage/ConpherenceThread.php b/src/applications/conpherence/storage/ConpherenceThread.php
index 3efed163a2..93b8c4f940 100644
--- a/src/applications/conpherence/storage/ConpherenceThread.php
+++ b/src/applications/conpherence/storage/ConpherenceThread.php
@@ -1,200 +1,197 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceThread extends ConpherenceDAO
   implements PhabricatorPolicyInterface {
 
   protected $title;
   protected $messageCount;
   protected $recentParticipantPHIDs = array();
   protected $mailKey;
 
   private $participants = self::ATTACHABLE;
   private $transactions = self::ATTACHABLE;
   private $handles = self::ATTACHABLE;
   private $filePHIDs = self::ATTACHABLE;
   private $widgetData = self::ATTACHABLE;
   private $images = array();
 
   public static function initializeNewThread(PhabricatorUser $sender) {
     return id(new ConpherenceThread())
       ->setMessageCount(0)
       ->setTitle('');
   }
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
       self::CONFIG_SERIALIZATION => array(
         'recentParticipantPHIDs' => self::SERIALIZATION_JSON,
       ),
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
       PhabricatorConpherencePHIDTypeThread::TYPECONST);
   }
 
   public function save() {
     if (!$this->getMailKey()) {
       $this->setMailKey(Filesystem::readRandomCharacters(20));
     }
     return parent::save();
   }
 
   public function attachParticipants(array $participants) {
     assert_instances_of($participants, 'ConpherenceParticipant');
     $this->participants = $participants;
     return $this;
   }
   public function getParticipants() {
     return $this->assertAttached($this->participants);
   }
   public function getParticipant($phid) {
     $participants = $this->getParticipants();
     return $participants[$phid];
   }
   public function getParticipantPHIDs() {
     $participants = $this->getParticipants();
     return array_keys($participants);
   }
 
   public function attachHandles(array $handles) {
     assert_instances_of($handles, 'PhabricatorObjectHandle');
     $this->handles = $handles;
     return $this;
   }
   public function getHandles() {
     return $this->assertAttached($this->handles);
   }
 
   public function attachTransactions(array $transactions) {
     assert_instances_of($transactions, 'ConpherenceTransaction');
     $this->transactions = $transactions;
     return $this;
   }
   public function getTransactions() {
     return $this->assertAttached($this->transactions);
   }
 
   public function getTransactionsFrom($begin = 0, $amount = null) {
     $length = count($this->transactions);
 
     return array_slice(
       $this->getTransactions(),
       $length - $begin - $amount,
       $amount);
   }
 
   public function attachFilePHIDs(array $file_phids) {
     $this->filePHIDs = $file_phids;
     return $this;
   }
   public function getFilePHIDs() {
     return $this->assertAttached($this->filePHIDs);
   }
 
   public function attachWidgetData(array $widget_data) {
     $this->widgetData = $widget_data;
     return $this;
   }
   public function getWidgetData() {
     return $this->assertAttached($this->widgetData);
   }
 
   public function getDisplayData(PhabricatorUser $user) {
     $recent_phids = $this->getRecentParticipantPHIDs();
     $handles = $this->getHandles();
 
     // luck has little to do with it really; most recent participant who isn't
     // the user....
     $lucky_phid = null;
     $lucky_index = null;
     foreach ($recent_phids as $index => $phid) {
       if ($phid == $user->getPHID()) {
         continue;
       }
       $lucky_phid = $phid;
       break;
     }
     reset($recent_phids);
 
     if ($lucky_phid) {
       $lucky_handle = $handles[$lucky_phid];
     // this will be just the user talking to themselves. weirdos.
     } else {
       $lucky_handle = reset($handles);
     }
 
     $title = $js_title = $this->getTitle();
     if (!$title) {
       $title = $lucky_handle->getName();
       $js_title = pht('[No Title]');
     }
     $img_src = $lucky_handle->getImageURI();
 
     $count = 0;
     $final = false;
     $subtitle = null;
     foreach ($recent_phids as $phid) {
       if ($phid == $user->getPHID()) {
         continue;
       }
       $handle = $handles[$phid];
       if ($subtitle) {
         if ($final) {
           $subtitle .= '...';
           break;
         } else {
           $subtitle .= ', ';
         }
       }
       $subtitle .= $handle->getName();
       $count++;
       $final = $count == 3;
     }
 
     $participants = $this->getParticipants();
     $user_participation = $participants[$user->getPHID()];
     $unread_count = $this->getMessageCount() -
       $user_participation->getSeenMessageCount();
 
     return array(
       'title' => $title,
       'js_title' => $js_title,
       'subtitle' => $subtitle,
       'unread_count' => $unread_count,
       'epoch' => $this->getDateModified(),
       'image' => $img_src,
     );
   }
 
 /* -(  PhabricatorPolicyInterface Implementation  )-------------------------- */
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
     );
   }
 
   public function getPolicy($capability) {
     return PhabricatorPolicies::POLICY_NOONE;
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $user) {
     // this bad boy isn't even created yet so go nuts $user
     if (!$this->getID()) {
       return true;
     }
     $participants = $this->getParticipants();
     return isset($participants[$user->getPHID()]);
   }
 
   public function describeAutomaticCapability($capability) {
     return pht('Participants in a thread can always view and edit it.');
   }
 
 }
diff --git a/src/applications/conpherence/storage/ConpherenceTransaction.php b/src/applications/conpherence/storage/ConpherenceTransaction.php
index 3853867b84..69f7d1a056 100644
--- a/src/applications/conpherence/storage/ConpherenceTransaction.php
+++ b/src/applications/conpherence/storage/ConpherenceTransaction.php
@@ -1,153 +1,150 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceTransaction extends PhabricatorApplicationTransaction {
 
   public function getApplicationName() {
     return 'conpherence';
   }
 
   public function getApplicationTransactionType() {
     return PhabricatorConpherencePHIDTypeThread::TYPECONST;
   }
 
   public function getApplicationTransactionCommentObject() {
     return new ConpherenceTransactionComment();
   }
 
   public function getNoEffectDescription() {
     switch ($this->getTransactionType()) {
       case ConpherenceTransactionType::TYPE_PARTICIPANTS:
         return pht(
           'You can not add a participant who has already been added.');
         break;
     }
 
     return parent::getNoEffectDescription();
   }
 
   public function shouldHide() {
     $old = $this->getOldValue();
 
     switch ($this->getTransactionType()) {
       case ConpherenceTransactionType::TYPE_PARTICIPANTS:
         return ($old === null);
       case ConpherenceTransactionType::TYPE_TITLE:
       case ConpherenceTransactionType::TYPE_DATE_MARKER:
         return false;
       case ConpherenceTransactionType::TYPE_FILES:
         return true;
       // we used to have them so just always hide
       case ConpherenceTransactionType::TYPE_PICTURE:
       case ConpherenceTransactionType::TYPE_PICTURE_CROP:
         return true;
     }
 
     return parent::shouldHide();
   }
 
   public function getTitle() {
     $author_phid = $this->getAuthorPHID();
 
     $old = $this->getOldValue();
     $new = $this->getNewValue();
 
     switch ($this->getTransactionType()) {
       case ConpherenceTransactionType::TYPE_TITLE:
         if ($old && $new) {
           $title = pht(
             '%s renamed this conpherence from "%s" to "%s".',
             $this->renderHandleLink($author_phid),
             $old,
             $new);
         } else if ($old) {
           $title = pht(
             '%s deleted the conpherence name "%s".',
             $this->renderHandleLink($author_phid),
             $old);
         } else {
           $title = pht(
             '%s named this conpherence "%s".',
             $this->renderHandleLink($author_phid),
             $new);
         }
         return $title;
       case ConpherenceTransactionType::TYPE_FILES:
         $add = array_diff($new, $old);
         $rem = array_diff($old, $new);
 
         if ($add && $rem) {
           $title = pht(
             '%s edited files(s), added %d and removed %d.',
             $this->renderHandleLink($author_phid),
             count($add),
             count($rem));
         } else if ($add) {
           $title = pht(
             '%s added %d files(s).',
             $this->renderHandleLink($author_phid),
             count($add));
         } else {
           $title = pht(
             '%s removed %d file(s).',
             $this->renderHandleLink($author_phid),
             count($rem));
         }
         return $title;
         break;
       case ConpherenceTransactionType::TYPE_PARTICIPANTS:
         $add = array_diff($new, $old);
         $rem = array_diff($old, $new);
 
         if ($add && $rem) {
           $title = pht(
             '%s edited participant(s), added %d: %s; removed %d: %s.',
             $this->renderHandleLink($author_phid),
             count($add),
             $this->renderHandleList($add),
             count($rem),
             $this->renderHandleList($rem));
         } else if ($add) {
           $title = pht(
             '%s added %d participant(s): %s.',
             $this->renderHandleLink($author_phid),
             count($add),
             $this->renderHandleList($add));
         } else {
           $title = pht(
             '%s removed %d participant(s): %s.',
             $this->renderHandleLink($author_phid),
             count($rem),
             $this->renderHandleList($rem));
         }
         return $title;
         break;
     }
 
     return parent::getTitle();
   }
 
   public function getRequiredHandlePHIDs() {
     $phids = parent::getRequiredHandlePHIDs();
 
     $old = $this->getOldValue();
     $new = $this->getNewValue();
 
     $phids[] = $this->getAuthorPHID();
     switch ($this->getTransactionType()) {
       case ConpherenceTransactionType::TYPE_TITLE:
       case ConpherenceTransactionType::TYPE_FILES:
       case ConpherenceTransactionType::TYPE_DATE_MARKER:
         break;
       case ConpherenceTransactionType::TYPE_PARTICIPANTS:
         $phids = array_merge($phids, $this->getOldValue());
         $phids = array_merge($phids, $this->getNewValue());
         break;
     }
 
     return $phids;
   }
 
 }
diff --git a/src/applications/conpherence/storage/ConpherenceTransactionComment.php b/src/applications/conpherence/storage/ConpherenceTransactionComment.php
index bc61f33977..f5e9bb266d 100644
--- a/src/applications/conpherence/storage/ConpherenceTransactionComment.php
+++ b/src/applications/conpherence/storage/ConpherenceTransactionComment.php
@@ -1,15 +1,12 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceTransactionComment
   extends PhabricatorApplicationTransactionComment {
 
   protected $conpherencePHID;
 
   public function getApplicationTransactionObject() {
     return new ConpherenceTransaction();
   }
 
 }
diff --git a/src/applications/conpherence/view/ConpherenceFileWidgetView.php b/src/applications/conpherence/view/ConpherenceFileWidgetView.php
index b85459b9d4..40d11da5e3 100644
--- a/src/applications/conpherence/view/ConpherenceFileWidgetView.php
+++ b/src/applications/conpherence/view/ConpherenceFileWidgetView.php
@@ -1,77 +1,74 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceFileWidgetView extends ConpherenceWidgetView {
 
   public function render() {
     require_celerity_resource('sprite-docs-css');
     $conpherence = $this->getConpherence();
     $widget_data = $conpherence->getWidgetData();
     $files = $widget_data['files'];
     $files_authors = $widget_data['files_authors'];
     $files_html = array();
 
     foreach ($files as $file) {
       $icon_class = $file->getDisplayIconForMimeType();
       $icon_view = phutil_tag(
         'div',
         array(
           'class' => 'file-icon sprite-docs '.$icon_class
         ),
         '');
       $file_view = id(new PhabricatorFileLinkView())
         ->setFilePHID($file->getPHID())
         ->setFileName(phutil_utf8_shorten($file->getName(), 28))
         ->setFileViewable($file->isViewableImage())
         ->setFileViewURI($file->getBestURI())
         ->setCustomClass('file-title');
 
       $who_done_it_text = '';
       // system generated files don't have authors
       if ($file->getAuthorPHID()) {
         $who_done_it_text = pht(
           'By %s ',
           $files_authors[$file->getPHID()]->renderLink());
       }
       $date_text = phabricator_relative_date(
         $file->getDateCreated(),
         $this->getUser());
 
       $who_done_it = phutil_tag(
         'div',
         array(
           'class' => 'file-uploaded-by'
         ),
         pht('%s%s.', $who_done_it_text, $date_text));
 
       $files_html[] = phutil_tag(
         'div',
         array(
           'class' => 'file-entry'
         ),
         array(
           $icon_view,
           $file_view,
           $who_done_it
         ));
     }
 
     if (empty($files)) {
       $files_html[] = javelin_tag(
         'div',
         array(
           'class' => 'no-files',
           'sigil' => 'no-files'),
         pht('No files.'));
     }
 
     return phutil_tag(
       'div',
       array('class' => 'file-list'),
       $files_html);
 
   }
 
 }
diff --git a/src/applications/conpherence/view/ConpherenceMenuItemView.php b/src/applications/conpherence/view/ConpherenceMenuItemView.php
index eaa24af46b..88794e1546 100644
--- a/src/applications/conpherence/view/ConpherenceMenuItemView.php
+++ b/src/applications/conpherence/view/ConpherenceMenuItemView.php
@@ -1,122 +1,120 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceMenuItemView extends AphrontTagView {
 
   private $title;
   private $subtitle;
   private $imageURI;
   private $href;
   private $epoch;
   private $unreadCount;
 
   public function setUnreadCount($unread_count) {
     $this->unreadCount = $unread_count;
     return $this;
   }
   public function getUnreadCount() {
     return $this->unreadCount;
   }
 
   public function setEpoch($epoch) {
     $this->epoch = $epoch;
     return $this;
   }
   public function getEpoch() {
     return $this->epoch;
   }
 
   public function setHref($href) {
     $this->href = $href;
     return $this;
   }
   public function getHref() {
     return $this->href;
   }
 
   public function setImageURI($image_uri) {
     $this->imageURI = $image_uri;
     return $this;
   }
   public function getImageURI() {
     return $this->imageURI;
   }
 
   public function setSubtitle($subtitle) {
     $this->subtitle = $subtitle;
     return $this;
   }
   public function getSubtitle() {
     return $this->subtitle;
   }
 
   public function setTitle($title) {
     $this->title = $title;
     return $this;
   }
 
   public function getTitle() {
     return $this->title;
   }
 
   protected function getTagName() {
     return 'a';
   }
 
   protected function getTagAttributes() {
     $classes = array('conpherence-menu-item-view');
     return array(
       'class' => $classes,
       'href' => $this->href,
     );
   }
 
   protected function getTagContent() {
     $image = null;
     if ($this->imageURI) {
       $image = phutil_tag(
         'span',
         array(
           'class' => 'conpherence-menu-item-image',
           'style' => 'background-image: url('.$this->imageURI.');'
         ),
         '');
     }
     $title = null;
     if ($this->title) {
       $title = phutil_tag(
         'span',
         array(
           'class' => 'conpherence-menu-item-title',
         ),
         $this->title);
     }
     $subtitle = null;
     if ($this->subtitle) {
       $subtitle = phutil_tag(
         'span',
         array(
           'class' => 'conpherence-menu-item-subtitle',
         ),
         $this->subtitle);
     }
     $unread_count = null;
     if ($this->unreadCount) {
       $unread_count = phutil_tag(
         'span',
         array(
           'class' => 'conpherence-menu-item-unread-count'
         ),
         (int)$this->unreadCount);
     }
 
     return array(
       $image,
       $title,
       $subtitle,
       $unread_count,
     );
   }
+
 }
diff --git a/src/applications/conpherence/view/ConpherencePeopleWidgetView.php b/src/applications/conpherence/view/ConpherencePeopleWidgetView.php
index c18c30788f..87660a767c 100644
--- a/src/applications/conpherence/view/ConpherencePeopleWidgetView.php
+++ b/src/applications/conpherence/view/ConpherencePeopleWidgetView.php
@@ -1,57 +1,56 @@
 <?php
-/**
- * @group conpherence
- */
+
 final class ConpherencePeopleWidgetView extends ConpherenceWidgetView {
 
   public function render() {
     $conpherence = $this->getConpherence();
     $widget_data = $conpherence->getWidgetData();
     $user = $this->getUser();
     $conpherence = $this->getConpherence();
     $participants = $conpherence->getParticipants();
     $handles = $conpherence->getHandles();
 
     $body = array();
     // future proof by using participants to iterate through handles;
     // we may have non-people handles sooner or later
     foreach ($participants as $user_phid => $participant) {
       $handle = $handles[$user_phid];
       $remove_html = '';
       if ($user_phid == $user->getPHID()) {
         $remove_html = javelin_tag(
           'a',
           array(
             'class' => 'remove',
             'sigil' => 'remove-person',
             'meta' => array(
               'remove_person' => $handle->getPHID(),
               'action' => 'remove_person',
             )
           ),
           hsprintf('<span class="close-icon">&times;</span>'));
       }
       $body[] = phutil_tag(
         'div',
         array(
           'class' => 'person-entry grouped'
         ),
         array(
           phutil_tag(
             'a',
             array(
               'class' => 'pic',
             ),
             phutil_tag(
               'img',
               array(
                 'src' => $handle->getImageURI()
               ),
               '')),
           $handle->renderLink(),
           $remove_html));
     }
 
     return $body;
   }
+
 }
diff --git a/src/applications/conpherence/view/ConpherenceTransactionView.php b/src/applications/conpherence/view/ConpherenceTransactionView.php
index 54cba87c2d..bffe5da9fd 100644
--- a/src/applications/conpherence/view/ConpherenceTransactionView.php
+++ b/src/applications/conpherence/view/ConpherenceTransactionView.php
@@ -1,102 +1,102 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceTransactionView extends AphrontView {
 
   private $conpherenceTransaction;
   private $handles;
   private $markupEngine;
 
   public function setMarkupEngine(PhabricatorMarkupEngine $markup_engine) {
     $this->markupEngine = $markup_engine;
     return $this;
   }
 
   public function setHandles(array $handles) {
     assert_instances_of($handles, 'PhabricatorObjectHandle');
     $this->handles = $handles;
     return $this;
   }
+
   public function getHandles() {
     return $this->handles;
   }
 
   public function setConpherenceTransaction(ConpherenceTransaction $tx) {
     $this->conpherenceTransaction = $tx;
     return $this;
   }
+
   private function getConpherenceTransaction() {
     return $this->conpherenceTransaction;
   }
 
   public function render() {
     $user = $this->getUser();
     $transaction = $this->getConpherenceTransaction();
     switch ($transaction->getTransactionType()) {
       case ConpherenceTransactionType::TYPE_DATE_MARKER:
         return phutil_tag(
           'div',
           array(
             'class' => 'date-marker'
           ),
           array(
             phutil_tag(
               'span',
               array(
                 'class' => 'date',
               ),
               phabricator_format_local_time(
                 $transaction->getDateCreated(),
                 $user,
               'M jS, Y'))));
         break;
     }
 
     $handles = $this->getHandles();
     $transaction->setHandles($handles);
     $author = $handles[$transaction->getAuthorPHID()];
     $transaction_view = id(new PhabricatorTransactionView())
       ->setUser($user)
       ->setEpoch($transaction->getDateCreated())
       ->setContentSource($transaction->getContentSource());
 
     $content = null;
     $content_class = null;
     $content = null;
     switch ($transaction->getTransactionType()) {
       case ConpherenceTransactionType::TYPE_TITLE:
         $content = $transaction->getTitle();
         $transaction_view->addClass('conpherence-edited');
         break;
       case ConpherenceTransactionType::TYPE_FILES:
         $content = $transaction->getTitle();
         break;
       case ConpherenceTransactionType::TYPE_PARTICIPANTS:
         $content = $transaction->getTitle();
         $transaction_view->addClass('conpherence-edited');
         break;
       case PhabricatorTransactions::TYPE_COMMENT:
         $comment = $transaction->getComment();
         $content = $this->markupEngine->getOutput(
           $comment,
           PhabricatorApplicationTransactionComment::MARKUP_FIELD_COMMENT);
         $content_class = 'conpherence-message phabricator-remarkup';
         $transaction_view
           ->setImageURI($author->getImageURI())
           ->setActions(array($author->renderLink()));
         break;
     }
 
     $transaction_view->appendChild(
       phutil_tag(
         'div',
         array(
           'class' => $content_class
         ),
         $content));
 
     return $transaction_view->render();
   }
+
 }
diff --git a/src/applications/conpherence/view/ConpherenceWidgetView.php b/src/applications/conpherence/view/ConpherenceWidgetView.php
index 010ad5ba19..b3e704dcd9 100644
--- a/src/applications/conpherence/view/ConpherenceWidgetView.php
+++ b/src/applications/conpherence/view/ConpherenceWidgetView.php
@@ -1,26 +1,24 @@
 <?php
 
-/**
- * @group conpherence
- */
 abstract class ConpherenceWidgetView extends AphrontView {
 
   private $conpherence;
   private $updateURI;
 
   public function setUpdateURI($update_uri) {
     $this->updateURI = $update_uri;
     return $this;
   }
   public function getUpdateURI() {
     return $this->updateURI;
   }
 
   public function setConpherence(ConpherenceThread $conpherence) {
     $this->conpherence = $conpherence;
     return $this;
   }
   public function getConpherence() {
     return $this->conpherence;
   }
+
 }
diff --git a/src/applications/countdown/controller/PhabricatorCountdownController.php b/src/applications/countdown/controller/PhabricatorCountdownController.php
index f1a5f09968..c16f143bb3 100644
--- a/src/applications/countdown/controller/PhabricatorCountdownController.php
+++ b/src/applications/countdown/controller/PhabricatorCountdownController.php
@@ -1,42 +1,40 @@
 <?php
 
-/**
- * @group countdown
- */
 abstract class PhabricatorCountdownController extends PhabricatorController {
 
   public function buildSideNavView($for_app = false) {
     $user = $this->getRequest()->getUser();
 
     $nav = new AphrontSideNavFilterView();
     $nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
 
     if ($for_app) {
       $nav->addFilter('create', pht('Create Countdown'));
     }
 
     id(new PhabricatorCountdownSearchEngine())
       ->setViewer($user)
       ->addNavigationItems($nav->getMenu());
 
     $nav->selectFilter(null);
 
     return $nav;
   }
 
   public function buildApplicationMenu() {
     return $this->buildSideNavView($for_app = true)->getMenu();
   }
 
   public function buildApplicationCrumbs() {
     $crumbs = parent::buildApplicationCrumbs();
 
     $crumbs->addAction(
       id(new PHUIListItemView())
         ->setName(pht('Create Countdown'))
         ->setHref($this->getApplicationURI('edit/'))
         ->setIcon('fa-plus-square'));
 
     return $crumbs;
   }
+
 }
diff --git a/src/applications/countdown/controller/PhabricatorCountdownDeleteController.php b/src/applications/countdown/controller/PhabricatorCountdownDeleteController.php
index d82cebaa5d..d57534a420 100644
--- a/src/applications/countdown/controller/PhabricatorCountdownDeleteController.php
+++ b/src/applications/countdown/controller/PhabricatorCountdownDeleteController.php
@@ -1,54 +1,50 @@
 <?php
 
-/**
- * @group countdown
- */
 final class PhabricatorCountdownDeleteController
   extends PhabricatorCountdownController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
-
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $countdown = id(new PhabricatorCountdownQuery())
       ->setViewer($user)
       ->withIDs(array($this->id))
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_VIEW,
             PhabricatorPolicyCapability::CAN_EDIT,
           ))
       ->executeOne();
 
     if (!$countdown) {
       return new Aphront404Response();
     }
 
     if ($request->isFormPost()) {
       $countdown->delete();
       return id(new AphrontRedirectResponse())
         ->setURI('/countdown/');
     }
 
     $inst = pht('Are you sure you want to delete the countdown %s?',
             $countdown->getTitle());
 
     $dialog = new AphrontDialogView();
     $dialog->setUser($request->getUser());
     $dialog->setTitle(pht('Really delete this countdown?'));
     $dialog->appendChild(phutil_tag('p', array(), $inst));
     $dialog->addSubmitButton(pht('Delete'));
     $dialog->addCancelButton('/countdown/');
     $dialog->setSubmitURI($request->getPath());
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
 }
diff --git a/src/applications/countdown/controller/PhabricatorCountdownEditController.php b/src/applications/countdown/controller/PhabricatorCountdownEditController.php
index 07cba1f472..76c813490d 100644
--- a/src/applications/countdown/controller/PhabricatorCountdownEditController.php
+++ b/src/applications/countdown/controller/PhabricatorCountdownEditController.php
@@ -1,130 +1,128 @@
 <?php
 
-/**
- * @group countdown
- */
 final class PhabricatorCountdownEditController
   extends PhabricatorCountdownController {
 
   private $id;
   public function willProcessRequest(array $data) {
     $this->id = idx($data, 'id');
   }
 
   public function processRequest() {
 
     $request = $this->getRequest();
     $user = $request->getUser();
     $epoch_control = id(new AphrontFormDateControl())
       ->setUser($user)
       ->setName('epoch')
       ->setLabel(pht('End Date'))
       ->setInitialTime(AphrontFormDateControl::TIME_END_OF_DAY);
 
     if ($this->id) {
       $page_title = pht('Edit Countdown');
       $countdown = id(new PhabricatorCountdownQuery())
         ->setViewer($user)
         ->withIDs(array($this->id))
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_VIEW,
             PhabricatorPolicyCapability::CAN_EDIT,
           ))
         ->executeOne();
       if (!$countdown) {
         return new Aphront404Response();
       }
     } else {
       $page_title = pht('Create Countdown');
       $countdown = PhabricatorCountdown::initializeNewCountdown($user);
     }
     $epoch_control->setValue($countdown->getEpoch());
 
     $e_text = true;
     $errors = array();
     if ($request->isFormPost()) {
       $title = $request->getStr('title');
       $epoch = $epoch_control->readValueFromRequest($request);
       $view_policy = $request->getStr('viewPolicy');
 
       $e_text = null;
       if (!strlen($title)) {
         $e_text = pht('Required');
         $errors[] = pht('You must give the countdown a name.');
       }
       if (!$epoch) {
         $errors[] = pht('You must give the countdown a valid end date.');
       }
 
       if (!count($errors)) {
         $countdown->setTitle($title);
         $countdown->setEpoch($epoch);
         $countdown->setViewPolicy($view_policy);
         $countdown->save();
         return id(new AphrontRedirectResponse())
           ->setURI('/countdown/'.$countdown->getID().'/');
       }
     }
 
     if ($countdown->getEpoch()) {
       $display_epoch = phabricator_datetime($countdown->getEpoch(), $user);
     } else {
       $display_epoch = $request->getStr('epoch');
     }
 
     $crumbs = $this->buildApplicationCrumbs();
 
     $cancel_uri = '/countdown/';
     if ($countdown->getID()) {
       $cancel_uri = '/countdown/'.$countdown->getID().'/';
       $crumbs->addTextCrumb('C'.$countdown->getID(), $cancel_uri);
       $crumbs->addTextCrumb(pht('Edit'));
       $submit_label = pht('Save Changes');
     } else {
       $crumbs->addTextCrumb(pht('Create Countdown'));
       $submit_label = pht('Create Countdown');
     }
 
     $policies = id(new PhabricatorPolicyQuery())
       ->setViewer($user)
       ->setObject($countdown)
       ->execute();
 
     $form = id(new AphrontFormView())
       ->setUser($user)
       ->setAction($request->getRequestURI()->getPath())
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Title'))
           ->setValue($countdown->getTitle())
           ->setName('title')
           ->setError($e_text))
       ->appendChild($epoch_control)
       ->appendChild(
         id(new AphrontFormPolicyControl())
           ->setUser($user)
           ->setName('viewPolicy')
           ->setPolicyObject($countdown)
           ->setPolicies($policies)
           ->setCapability(PhabricatorPolicyCapability::CAN_VIEW))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->addCancelButton($cancel_uri)
           ->setValue($submit_label));
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText($page_title)
       ->setFormErrors($errors)
       ->setForm($form);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $form_box,
       ),
       array(
         'title' => $page_title,
       ));
   }
+
 }
diff --git a/src/applications/countdown/query/PhabricatorCountdownQuery.php b/src/applications/countdown/query/PhabricatorCountdownQuery.php
index 6d82fe268b..ed05648d02 100644
--- a/src/applications/countdown/query/PhabricatorCountdownQuery.php
+++ b/src/applications/countdown/query/PhabricatorCountdownQuery.php
@@ -1,92 +1,88 @@
 <?php
 
-/**
- * @group countdown
- */
 final class PhabricatorCountdownQuery
   extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $ids;
   private $phids;
   private $authorPHIDs;
   private $upcoming;
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
     return $this;
   }
 
   public function withPHIDs(array $phids) {
     $this->phids = $phids;
     return $this;
   }
 
   public function withAuthorPHIDs(array $author_phids) {
     $this->authorPHIDs = $author_phids;
     return $this;
   }
 
   public function withUpcoming($upcoming) {
     $this->upcoming = true;
     return $this;
   }
 
   protected function loadPage() {
     $table = new PhabricatorCountdown();
     $conn_r = $table->establishConnection('r');
 
     $data = queryfx_all(
       $conn_r,
       'SELECT * FROM %T %Q %Q %Q',
       $table->getTableName(),
       $this->buildWhereClause($conn_r),
       $this->buildOrderClause($conn_r),
       $this->buildLimitClause($conn_r));
 
     $countdowns = $table->loadAllFromArray($data);
 
-
     return $countdowns;
   }
 
   private function buildWhereClause(AphrontDatabaseConnection $conn_r) {
     $where = array();
 
     $where[] = $this->buildPagingClause($conn_r);
 
     if ($this->ids) {
       $where[] = qsprintf(
         $conn_r,
         'id IN (%Ld)',
         $this->ids);
     }
 
     if ($this->phids) {
       $where[] = qsprintf(
         $conn_r,
         'phid IN (%Ls)',
         $this->phids);
     }
 
     if ($this->authorPHIDs) {
       $where[] = qsprintf(
         $conn_r,
         'authorPHID in (%Ls)',
         $this->authorPHIDs);
     }
 
     if ($this->upcoming) {
       $where[] = qsprintf(
         $conn_r,
         'epoch >= %d',
         time());
     }
 
     return $this->formatWhereClause($where);
   }
 
   public function getQueryApplicationClass() {
     return 'PhabricatorApplicationCountdown';
   }
 
 }
diff --git a/src/applications/countdown/remarkup/PhabricatorCountdownRemarkupRule.php b/src/applications/countdown/remarkup/PhabricatorCountdownRemarkupRule.php
index 3134a9d40d..e615a63fde 100644
--- a/src/applications/countdown/remarkup/PhabricatorCountdownRemarkupRule.php
+++ b/src/applications/countdown/remarkup/PhabricatorCountdownRemarkupRule.php
@@ -1,29 +1,26 @@
 <?php
 
-/**
- * @group countdown
- */
 final class PhabricatorCountdownRemarkupRule
   extends PhabricatorRemarkupRuleObject {
 
   protected function getObjectNamePrefix() {
     return 'C';
   }
 
   protected function loadObjects(array $ids) {
     $viewer = $this->getEngine()->getConfig('viewer');
     return id(new PhabricatorCountdownQuery())
       ->setViewer($viewer)
       ->withIDs($ids)
       ->execute();
   }
 
   protected function renderObjectEmbed($object, $handle, $options) {
     $viewer = $this->getEngine()->getConfig('viewer');
 
     return id(new PhabricatorCountdownView())
       ->setCountdown($object)
       ->setUser($viewer);
   }
 
 }
diff --git a/src/applications/countdown/storage/PhabricatorCountdownDAO.php b/src/applications/countdown/storage/PhabricatorCountdownDAO.php
index fecc8ffae6..50d05d149c 100644
--- a/src/applications/countdown/storage/PhabricatorCountdownDAO.php
+++ b/src/applications/countdown/storage/PhabricatorCountdownDAO.php
@@ -1,12 +1,9 @@
 <?php
 
-/**
- * @group countdown
- */
 abstract class PhabricatorCountdownDAO extends PhabricatorLiskDAO {
 
   public function getApplicationName() {
     return 'countdown';
   }
 
 }
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_finishpostponedlinters_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_finishpostponedlinters_Method.php
index b5018dbb55..6defb7dba9 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_finishpostponedlinters_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_finishpostponedlinters_Method.php
@@ -1,116 +1,116 @@
 <?php
 
 final class ConduitAPI_differential_finishpostponedlinters_Method
   extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
     return 'Update diff with new lint messages and mark postponed '.
            'linters as finished.';
   }
 
   public function defineParamTypes() {
     return array(
       'diffID'   => 'required diffID',
       'linters'  => 'required dict',
     );
   }
 
   public function defineReturnType() {
     return 'void';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-BAD-DIFF'   => 'Bad diff ID.',
       'ERR-BAD-LINTER' => 'No postponed linter by the given name',
       'ERR-NO-LINT'    => 'No postponed lint field available in diff',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
 
     $diff_id = $request->getValue('diffID');
     $linter_map = $request->getValue('linters');
 
     $diff = id(new DifferentialDiffQuery())
       ->setViewer($request->getUser())
       ->withIDs(array($diff_id))
       ->executeOne();
     if (!$diff) {
       throw new ConduitException('ERR-BAD-DIFF');
     }
 
     // Extract the finished linters and messages from the linter map.
     $finished_linters = array_keys($linter_map);
     $new_messages = array();
     foreach ($linter_map as $linter => $messages) {
       $new_messages = array_merge($new_messages, $messages);
     }
 
     // Load the postponed linters attached to this diff.
     $postponed_linters_property = id(
       new DifferentialDiffProperty())->loadOneWhere(
         'diffID = %d AND name = %s',
         $diff_id,
         'arc:lint-postponed');
     if ($postponed_linters_property) {
       $postponed_linters = $postponed_linters_property->getData();
     } else {
       $postponed_linters = array();
     }
 
     foreach ($finished_linters as $linter) {
       if (!in_array($linter, $postponed_linters)) {
         throw new ConduitException('ERR-BAD-LINTER');
       }
     }
 
     foreach ($postponed_linters as $idx => $linter) {
       if (in_array($linter, $finished_linters)) {
         unset($postponed_linters[$idx]);
       }
     }
 
-    // Load the lint messages currenty attached to the diff.  If this
+    // Load the lint messages currenty attached to the diff. If this
     // diff property doesn't exist, create it.
     $messages_property = id(new DifferentialDiffProperty())->loadOneWhere(
       'diffID = %d AND name = %s',
       $diff_id,
       'arc:lint');
     if ($messages_property) {
       $messages = $messages_property->getData();
     } else {
       $messages = array();
     }
 
     // Add new lint messages, removing duplicates.
     foreach ($new_messages as $new_message) {
       if (!in_array($new_message, $messages)) {
         $messages[] = $new_message;
       }
     }
 
     // Use setdiffproperty to update the postponed linters and messages,
     // as these will also update the lint status correctly.
     $call = new ConduitCall(
       'differential.setdiffproperty',
       array(
         'diff_id' => $diff_id,
         'name' => 'arc:lint',
         'data' => json_encode($messages)));
     $call->setForceLocal(true);
     $call->setUser($request->getUser());
     $call->execute();
     $call = new ConduitCall(
       'differential.setdiffproperty',
       array(
         'diff_id' => $diff_id,
         'name' => 'arc:lint-postponed',
         'data' => json_encode($postponed_linters)));
     $call->setForceLocal(true);
     $call->setUser($request->getUser());
     $call->execute();
 
   }
 
 }
diff --git a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
index eded1991e6..6d1223c195 100644
--- a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
+++ b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
@@ -1,300 +1,300 @@
 <?php
 
 final class PhabricatorDifferentialConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
     return pht('Differential');
   }
 
   public function getDescription() {
     return pht('Configure Differential code review.');
   }
 
   public function getOptions() {
     $custom_field_type = 'custom:PhabricatorCustomFieldConfigOptionType';
 
     $fields = array(
       new DifferentialTitleField(),
       new DifferentialSummaryField(),
       new DifferentialTestPlanField(),
       new DifferentialAuthorField(),
       new DifferentialReviewersField(),
       new DifferentialProjectReviewersField(),
       new DifferentialReviewedByField(),
       new DifferentialSubscribersField(),
       new DifferentialRepositoryField(),
       new DifferentialLintField(),
       new DifferentialProjectsField(),
       new DifferentialUnitField(),
       new DifferentialViewPolicyField(),
       new DifferentialEditPolicyField(),
 
       new DifferentialDependsOnField(),
       new DifferentialDependenciesField(),
       new DifferentialManiphestTasksField(),
       new DifferentialCommitsField(),
 
       new DifferentialJIRAIssuesField(),
       new DifferentialAsanaRepresentationField(),
 
       new DifferentialChangesSinceLastUpdateField(),
       new DifferentialBranchField(),
 
       new DifferentialBlameRevisionField(),
       new DifferentialPathField(),
       new DifferentialHostField(),
       new DifferentialRevertPlanField(),
 
       new DifferentialApplyPatchField(),
 
       new DifferentialRevisionIDField(),
     );
 
     $default_fields = array();
     foreach ($fields as $field) {
       $default_fields[$field->getFieldKey()] = array(
         'disabled' => $field->shouldDisableByDefault(),
       );
     }
 
     return array(
       $this->newOption(
         'differential.fields',
         $custom_field_type,
         $default_fields)
         ->setCustomData(
           id(new DifferentialRevision())->getCustomFieldBaseClass())
         ->setDescription(
           pht(
             "Select and reorder revision fields.\n\n".
             "NOTE: This feature is under active development and subject ".
             "to change.")),
       $this->newOption(
         'differential.whitespace-matters',
         'list<regex>',
         array(
           '/\.py$/',
           '/\.l?hs$/',
         ))
         ->setDescription(
           pht(
             "List of file regexps where whitespace is meaningful and should ".
             "not use 'ignore-all' by default")),
       $this->newOption('differential.require-test-plan-field', 'bool', true)
         ->setBoolOptions(
           array(
             pht("Require 'Test Plan' field"),
             pht("Make 'Test Plan' field optional"),
           ))
         ->setSummary(pht('Require "Test Plan" field?'))
         ->setDescription(
           pht(
             "Differential has a required 'Test Plan' field by default. You ".
             "can make it optional by setting this to false. You can also ".
             "completely remove it above, if you prefer.")),
       $this->newOption('differential.enable-email-accept', 'bool', false)
         ->setBoolOptions(
           array(
             pht('Enable Email "!accept" Action'),
             pht('Disable Email "!accept" Action'),
           ))
         ->setSummary(pht('Enable or disable "!accept" action via email.'))
         ->setDescription(
           pht(
             'If inbound email is configured, users can interact with '.
             'revisions by using "!actions" in email replies (for example, '.
             '"!resign" or "!rethink"). However, by default, users may not '.
             '"!accept" revisions via email: email authentication can be '.
             'configured to be very weak, and email "!accept" is kind of '.
             'sketchy and implies the revision may not actually be receiving '.
             'thorough review. You can enable "!accept" by setting this '.
             'option to true.')),
       $this->newOption('differential.generated-paths', 'list<regex>', array())
         ->setSummary(pht('File regexps to treat as automatically generated.'))
         ->setDescription(
           pht(
             'List of file regexps that should be treated as if they are '.
             'generated by an automatic process, and thus get hidden by '.
             'default in differential.'))
         ->addExample("/config\.h$/\n#/autobuilt/#", pht('Valid Setting')),
       $this->newOption('differential.sticky-accept', 'bool', true)
         ->setBoolOptions(
           array(
             pht('Accepts persist across updates'),
             pht('Accepts are reset by updates'),
           ))
         ->setSummary(
           pht('Should "Accepted" revisions remain "Accepted" after updates?'))
         ->setDescription(
           pht(
             'Normally, when revisions that have been "Accepted" are updated, '.
             'they remain "Accepted". This allows reviewers to suggest minor '.
             'alterations when accepting, and encourages authors to update '.
             'if they make minor changes in response to this feedback.'.
             "\n\n".
             'If you want updates to always require re-review, you can disable '.
             'the "stickiness" of the "Accepted" status with this option. '.
             'This may make the process for minor changes much more burdensome '.
             'to both authors and reviewers.')),
       $this->newOption('differential.allow-self-accept', 'bool', false)
         ->setBoolOptions(
           array(
             pht('Allow self-accept'),
             pht('Disallow self-accept'),
           ))
         ->setSummary(pht('Allows users to accept their own revisions.'))
         ->setDescription(
           pht(
-            "If you set this to true, users can accept their own revisions.  ".
+            "If you set this to true, users can accept their own revisions. ".
             "This action is disabled by default because it's most likely not ".
             "a behavior you want, but it proves useful if you are working ".
             "alone on a project and want to make use of all of ".
             "differential's features.")),
       $this->newOption('differential.always-allow-close', 'bool', false)
         ->setBoolOptions(
           array(
             pht('Allow any user'),
             pht('Restrict to submitter'),
           ))
         ->setSummary(pht('Allows any user to close accepted revisions.'))
         ->setDescription(
           pht(
             'If you set this to true, any user can close any revision so '.
             'long as it has been accepted. This can be useful depending on '.
             'your development model. For example, github-style pull requests '.
             'where the reviewer is often the actual committer can benefit '.
             'from turning this option to true. If false, only the submitter '.
             'can close a revision.')),
       $this->newOption('differential.always-allow-abandon', 'bool', false)
         ->setBoolOptions(
           array(
             pht('Allow any user'),
             pht('Restrict to submitter'),
           ))
         ->setSummary(pht('Allows any user to abandon revisions.'))
         ->setDescription(
           pht(
             'If you set this to true, any user can abandon any revision. If '.
             'false, only the submitter can abandon a revision.')),
       $this->newOption('differential.allow-reopen', 'bool', false)
         ->setBoolOptions(
           array(
             pht('Enable reopen'),
             pht('Disable reopen'),
           ))
         ->setSummary(pht('Allows any user to reopen a closed revision.'))
         ->setDescription(
           pht('If you set this to true, any user can reopen a revision so '.
-              'long as it has been closed.  This can be useful if a revision '.
+              'long as it has been closed. This can be useful if a revision '.
               'is accidentally closed or if a developer changes his or her '.
-              'mind after closing a revision.  If it is false, reopening '.
+              'mind after closing a revision. If it is false, reopening '.
               'is not allowed.')),
       $this->newOption('differential.close-on-accept', 'bool', false)
         ->setBoolOptions(
           array(
             pht('Treat Accepted Revisions as "Closed"'),
             pht('Treat Accepted Revisions as "Open"'),
           ))
         ->setSummary(pht('Allows "Accepted" to act as a closed status.'))
         ->setDescription(
           pht(
             'Normally, Differential revisions remain on the dashboard when '.
             'they are "Accepted", and the author then commits the changes '.
             'to "Close" the revision and move it off the dashboard.'.
             "\n\n".
             'If you have an unusual workflow where Differential is used for '.
             'post-commit review (normally called "Audit", elsewhere in '.
             'Phabricator), you can set this flag to treat the "Accepted" '.
             'state as a "Closed" state and end the review workflow early.'.
             "\n\n".
             'This sort of workflow is very unusual. Very few installs should '.
             'need to change this option.')),
       $this->newOption('differential.days-fresh', 'int', 1)
         ->setSummary(
           pht(
             "For how many business days should a revision be considered ".
             "'fresh'?"))
         ->setDescription(
           pht(
             'Revisions newer than this number of days are marked as fresh in '.
             'Action Required and Revisions Waiting on You views. Only work '.
             'days (not weekends and holidays) are included. Set to 0 to '.
             'disable this feature.')),
       $this->newOption('differential.days-stale', 'int', 3)
         ->setSummary(
           pht("After this many days, a revision will be considered 'stale'."))
         ->setDescription(
           pht(
             "Similar to `differential.days-fresh` but marks stale revisions. ".
             "If the revision is even older than it is when marked as 'old'.")),
       $this->newOption(
         'metamta.differential.reply-handler-domain',
         'string',
         null)
         ->setDescription(
           pht('Inbound email domain for Differential replies.')),
       $this->newOption(
         'metamta.differential.reply-handler',
         'class',
         'DifferentialReplyHandler')
         ->setBaseClass('PhabricatorMailReplyHandler')
         ->setDescription(pht('Alternate reply handler class.')),
       $this->newOption(
         'metamta.differential.subject-prefix',
         'string',
         '[Differential]')
         ->setDescription(pht('Subject prefix for Differential mail.')),
       $this->newOption(
         'metamta.differential.attach-patches',
         'bool',
         false)
         ->setBoolOptions(
           array(
             pht('Attach Patches'),
             pht('Do Not Attach Patches'),
           ))
         ->setSummary(pht('Attach patches to email, as text attachments.'))
         ->setDescription(
           pht(
             'If you set this to true, Phabricator will attach patches to '.
             'Differential mail (as text attachments). This will not work if '.
             'you are using SendGrid as your mail adapter.')),
       $this->newOption(
         'metamta.differential.inline-patches',
         'int',
         0)
         ->setSummary(pht('Inline patches in email, as body text.'))
         ->setDescription(
           pht(
             "To include patches inline in email bodies, set this to a ".
             "positive integer. Patches will be inlined if they are at most ".
             "that many lines. For instance, a value of 100 means 'inline ".
             "patches if they are no longer than 100 lines'. By default, ".
             "patches are not inlined.")),
       // TODO: Implement 'enum'? Options are 'unified' or 'git'.
       $this->newOption(
         'metamta.differential.patch-format',
         'string',
         'unified')
         ->setDescription(
           pht("Format for inlined or attached patches: 'git' or 'unified'.")),
       $this->newOption(
         'metamta.differential.unified-comment-context',
         'bool',
         false)
         ->setBoolOptions(
           array(
             pht('Show context'),
             pht('Do not show context'),
           ))
         ->setSummary(pht('Show diff context around inline comments in email.'))
         ->setDescription(
           pht(
             'Normally, inline comments in emails are shown with a file and '.
             'line but without any diff context. Enabling this option adds '.
             'diff context.')),
     );
   }
 
 }
diff --git a/src/applications/differential/parser/DifferentialChangesetParser.php b/src/applications/differential/parser/DifferentialChangesetParser.php
index 7b9bc23397..db9604a779 100644
--- a/src/applications/differential/parser/DifferentialChangesetParser.php
+++ b/src/applications/differential/parser/DifferentialChangesetParser.php
@@ -1,1300 +1,1300 @@
 <?php
 
 final class DifferentialChangesetParser {
 
   protected $visible      = array();
   protected $new          = array();
   protected $old          = array();
   protected $intra        = array();
   protected $newRender    = null;
   protected $oldRender    = null;
 
   protected $filename     = null;
   protected $hunkStartLines = array();
 
   protected $comments     = array();
   protected $specialAttributes = array();
 
   protected $changeset;
   protected $whitespaceMode = null;
 
   protected $renderCacheKey = null;
 
   private $handles = array();
   private $user;
 
   private $leftSideChangesetID;
   private $leftSideAttachesToNewFile;
 
   private $rightSideChangesetID;
   private $rightSideAttachesToNewFile;
 
   private $originalLeft;
   private $originalRight;
 
   private $renderingReference;
   private $isSubparser;
 
   private $isTopLevel;
   private $coverage;
   private $markupEngine;
   private $highlightErrors;
   private $disableCache;
   private $renderer;
   private $characterEncoding;
   private $highlightAs;
 
   public function setHighlightAs($highlight_as) {
     $this->highlightAs = $highlight_as;
     return $this;
   }
 
   public function getHighlightAs() {
     return $this->highlightAs;
   }
 
   public function setCharacterEncoding($character_encoding) {
     $this->characterEncoding = $character_encoding;
     return $this;
   }
 
   public function getCharacterEncoding() {
     return $this->characterEncoding;
   }
 
   public function setRenderer($renderer) {
     $this->renderer = $renderer;
     return $this;
   }
 
   public function getRenderer() {
     if (!$this->renderer) {
       return new DifferentialChangesetTwoUpRenderer();
     }
     return $this->renderer;
   }
 
   public function setDisableCache($disable_cache) {
     $this->disableCache = $disable_cache;
     return $this;
   }
 
   public function getDisableCache() {
     return $this->disableCache;
   }
 
   const CACHE_VERSION = 11;
   const CACHE_MAX_SIZE = 8e6;
 
   const ATTR_GENERATED  = 'attr:generated';
   const ATTR_DELETED    = 'attr:deleted';
   const ATTR_UNCHANGED  = 'attr:unchanged';
   const ATTR_WHITELINES = 'attr:white';
 
   const LINES_CONTEXT = 8;
 
   const WHITESPACE_SHOW_ALL         = 'show-all';
   const WHITESPACE_IGNORE_TRAILING  = 'ignore-trailing';
 
   // TODO: This is now "Ignore Most" in the UI.
   const WHITESPACE_IGNORE_ALL       = 'ignore-all';
 
   const WHITESPACE_IGNORE_FORCE     = 'ignore-force';
 
   public function setOldLines(array $lines) {
     $this->old = $lines;
     return $this;
   }
 
   public function setNewLines(array $lines) {
     $this->new = $lines;
     return $this;
   }
 
   public function setSpecialAttributes(array $attributes) {
     $this->specialAttributes = $attributes;
     return $this;
   }
 
   public function setIntraLineDiffs(array $diffs) {
     $this->intra = $diffs;
     return $this;
   }
 
   public function setVisibileLinesMask(array $mask) {
     $this->visible = $mask;
     return $this;
   }
 
   /**
    * Configure which Changeset comments added to the right side of the visible
    * diff will be attached to. The ID must be the ID of a real Differential
    * Changeset.
    *
    * The complexity here is that we may show an arbitrary side of an arbitrary
    * changeset as either the left or right part of a diff. This method allows
    * the left and right halves of the displayed diff to be correctly mapped to
    * storage changesets.
    *
    * @param id    The Differential Changeset ID that comments added to the right
    *              side of the visible diff should be attached to.
    * @param bool  If true, attach new comments to the right side of the storage
    *              changeset. Note that this may be false, if the left side of
    *              some storage changeset is being shown as the right side of
    *              a display diff.
    * @return this
    */
   public function setRightSideCommentMapping($id, $is_new) {
     $this->rightSideChangesetID = $id;
     $this->rightSideAttachesToNewFile = $is_new;
     return $this;
   }
 
   /**
    * See setRightSideCommentMapping(), but this sets information for the left
    * side of the display diff.
    */
   public function setLeftSideCommentMapping($id, $is_new) {
     $this->leftSideChangesetID = $id;
     $this->leftSideAttachesToNewFile = $is_new;
     return $this;
   }
 
   public function setOriginals(
     DifferentialChangeset $left,
     DifferentialChangeset $right) {
 
     $this->originalLeft = $left;
     $this->originalRight = $right;
   }
 
   public function diffOriginals() {
     $engine = new PhabricatorDifferenceEngine();
     $changeset = $engine->generateChangesetFromFileContent(
       implode('', mpull($this->originalLeft->getHunks(), 'getChanges')),
       implode('', mpull($this->originalRight->getHunks(), 'getChanges')));
 
     $parser = new DifferentialHunkParser();
 
     return $parser->parseHunksForHighlightMasks(
       $changeset->getHunks(),
       $this->originalLeft->getHunks(),
       $this->originalRight->getHunks());
   }
 
   /**
    * Set a key for identifying this changeset in the render cache. If set, the
    * parser will attempt to use the changeset render cache, which can improve
    * performance for frequently-viewed changesets.
    *
    * By default, there is no render cache key and parsers do not use the cache.
    * This is appropriate for rarely-viewed changesets.
    *
    * NOTE: Currently, this key must be a valid Differential Changeset ID.
    *
    * @param   string  Key for identifying this changeset in the render cache.
    * @return  this
    */
   public function setRenderCacheKey($key) {
     $this->renderCacheKey = $key;
     return $this;
   }
 
   private function getRenderCacheKey() {
     return $this->renderCacheKey;
   }
 
   public function setChangeset(DifferentialChangeset $changeset) {
     $this->changeset = $changeset;
 
     $this->setFilename($changeset->getFilename());
 
     return $this;
   }
 
   public function setWhitespaceMode($whitespace_mode) {
     $this->whitespaceMode = $whitespace_mode;
     return $this;
   }
 
   public function setRenderingReference($ref) {
     $this->renderingReference = $ref;
     return $this;
   }
 
   private function getRenderingReference() {
     return $this->renderingReference;
   }
 
   public function getChangeset() {
     return $this->changeset;
   }
 
   public function setFilename($filename) {
     $this->filename = $filename;
     return $this;
   }
 
   public function setHandles(array $handles) {
     assert_instances_of($handles, 'PhabricatorObjectHandle');
     $this->handles = $handles;
     return $this;
   }
 
   public function setMarkupEngine(PhabricatorMarkupEngine $engine) {
     $this->markupEngine = $engine;
     return $this;
   }
 
   public function setUser(PhabricatorUser $user) {
     $this->user = $user;
     return $this;
   }
 
   public function setCoverage($coverage) {
     $this->coverage = $coverage;
     return $this;
   }
   private function getCoverage() {
     return $this->coverage;
   }
 
   public function parseInlineComment(
     PhabricatorInlineCommentInterface $comment) {
 
     // Parse only comments which are actually visible.
     if ($this->isCommentVisibleOnRenderedDiff($comment)) {
       $this->comments[] = $comment;
     }
     return $this;
   }
 
   private function loadCache() {
     $render_cache_key = $this->getRenderCacheKey();
     if (!$render_cache_key) {
       return false;
     }
 
     $data = null;
 
     $changeset = new DifferentialChangeset();
     $conn_r = $changeset->establishConnection('r');
     $data = queryfx_one(
       $conn_r,
       'SELECT * FROM %T WHERE id = %d',
       $changeset->getTableName().'_parse_cache',
       $render_cache_key);
 
     if (!$data) {
       return false;
     }
 
     if ($data['cache'][0] == '{') {
       // This is likely an old-style JSON cache which we will not be able to
       // deserialize.
       return false;
     }
 
     $data = unserialize($data['cache']);
     if (!is_array($data) || !$data) {
       return false;
     }
 
     foreach (self::getCacheableProperties() as $cache_key) {
       if (!array_key_exists($cache_key, $data)) {
         // If we're missing a cache key, assume we're looking at an old cache
         // and ignore it.
         return false;
       }
     }
 
     if ($data['cacheVersion'] !== self::CACHE_VERSION) {
       return false;
     }
 
     // Someone displays contents of a partially cached shielded file.
     if (!isset($data['newRender']) && (!$this->isTopLevel || $this->comments)) {
       return false;
     }
 
     unset($data['cacheVersion'], $data['cacheHost']);
     $cache_prop = array_select_keys($data, self::getCacheableProperties());
     foreach ($cache_prop as $cache_key => $v) {
       $this->$cache_key = $v;
     }
 
     return true;
   }
 
   protected static function getCacheableProperties() {
     return array(
       'visible',
       'new',
       'old',
       'intra',
       'newRender',
       'oldRender',
       'specialAttributes',
       'hunkStartLines',
       'cacheVersion',
       'cacheHost',
     );
   }
 
   public function saveCache() {
     if ($this->highlightErrors) {
       return false;
     }
 
     $render_cache_key = $this->getRenderCacheKey();
     if (!$render_cache_key) {
       return false;
     }
 
     $cache = array();
     foreach (self::getCacheableProperties() as $cache_key) {
       switch ($cache_key) {
         case 'cacheVersion':
           $cache[$cache_key] = self::CACHE_VERSION;
           break;
         case 'cacheHost':
           $cache[$cache_key] = php_uname('n');
           break;
         default:
           $cache[$cache_key] = $this->$cache_key;
           break;
       }
     }
     $cache = serialize($cache);
 
     // We don't want to waste too much space by a single changeset.
     if (strlen($cache) > self::CACHE_MAX_SIZE) {
       return;
     }
 
     $changeset = new DifferentialChangeset();
     $conn_w = $changeset->establishConnection('w');
 
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
       try {
         queryfx(
           $conn_w,
           'INSERT INTO %T (id, cache, dateCreated) VALUES (%d, %B, %d)
             ON DUPLICATE KEY UPDATE cache = VALUES(cache)',
           DifferentialChangeset::TABLE_CACHE,
           $render_cache_key,
           $cache,
           time());
       } catch (AphrontQueryException $ex) {
         // Ignore these exceptions. A common cause is that the cache is
         // larger than 'max_allowed_packet', in which case we're better off
         // not writing it.
 
         // TODO: It would be nice to tailor this more narrowly.
       }
     unset($unguarded);
   }
 
   private function markGenerated($new_corpus_block = '') {
     $generated_guess = (strpos($new_corpus_block, '@'.'generated') !== false);
 
     if (!$generated_guess) {
       $generated_path_regexps = PhabricatorEnv::getEnvConfig(
         'differential.generated-paths');
       foreach ($generated_path_regexps as $regexp) {
         if (preg_match($regexp, $this->changeset->getFilename())) {
           $generated_guess = true;
           break;
         }
       }
     }
 
     $event = new PhabricatorEvent(
       PhabricatorEventType::TYPE_DIFFERENTIAL_WILLMARKGENERATED,
       array(
         'corpus' => $new_corpus_block,
         'is_generated' => $generated_guess,
       )
     );
     PhutilEventEngine::dispatchEvent($event);
 
     $generated = $event->getValue('is_generated');
     $this->specialAttributes[self::ATTR_GENERATED] = $generated;
   }
 
   public function isGenerated() {
     return idx($this->specialAttributes, self::ATTR_GENERATED, false);
   }
 
   public function isDeleted() {
     return idx($this->specialAttributes, self::ATTR_DELETED, false);
   }
 
   public function isUnchanged() {
     return idx($this->specialAttributes, self::ATTR_UNCHANGED, false);
   }
 
   public function isWhitespaceOnly() {
     return idx($this->specialAttributes, self::ATTR_WHITELINES, false);
   }
 
   private function applyIntraline(&$render, $intra, $corpus) {
 
     foreach ($render as $key => $text) {
       if (isset($intra[$key])) {
         $render[$key] = ArcanistDiffUtils::applyIntralineDiff(
           $text,
           $intra[$key]);
       }
     }
   }
 
   private function getHighlightFuture($corpus) {
     $language = $this->highlightAs;
 
     if (!$language) {
       $language = $this->highlightEngine->getLanguageFromFilename(
         $this->filename);
     }
 
     return $this->highlightEngine->getHighlightFuture(
       $language,
       $corpus);
   }
 
   protected function processHighlightedSource($data, $result) {
 
     $result_lines = phutil_split_lines($result);
     foreach ($data as $key => $info) {
       if (!$info) {
         unset($result_lines[$key]);
       }
     }
     return $result_lines;
   }
 
   private function tryCacheStuff() {
     $whitespace_mode = $this->whitespaceMode;
     switch ($whitespace_mode) {
       case self::WHITESPACE_SHOW_ALL:
       case self::WHITESPACE_IGNORE_TRAILING:
       case self::WHITESPACE_IGNORE_FORCE:
         break;
       default:
         $whitespace_mode = self::WHITESPACE_IGNORE_ALL;
         break;
     }
 
     $skip_cache = ($whitespace_mode != self::WHITESPACE_IGNORE_ALL);
     if ($this->disableCache) {
       $skip_cache = true;
     }
 
     if ($this->characterEncoding) {
       $skip_cache = true;
     }
 
     if ($this->highlightAs) {
       $skip_cache = true;
     }
 
     $this->whitespaceMode = $whitespace_mode;
 
     $changeset = $this->changeset;
 
     if ($changeset->getFileType() != DifferentialChangeType::FILE_TEXT &&
         $changeset->getFileType() != DifferentialChangeType::FILE_SYMLINK) {
 
       $this->markGenerated();
 
     } else {
       if ($skip_cache || !$this->loadCache()) {
         $this->process();
         if (!$skip_cache) {
           $this->saveCache();
         }
       }
     }
   }
 
   private function process() {
     $whitespace_mode = $this->whitespaceMode;
     $changeset = $this->changeset;
 
     $ignore_all = (($whitespace_mode == self::WHITESPACE_IGNORE_ALL) ||
                   ($whitespace_mode == self::WHITESPACE_IGNORE_FORCE));
 
     $force_ignore = ($whitespace_mode == self::WHITESPACE_IGNORE_FORCE);
 
     if (!$force_ignore) {
       if ($ignore_all && $changeset->getWhitespaceMatters()) {
         $ignore_all = false;
       }
     }
 
     // The "ignore all whitespace" algorithm depends on rediffing the
     // files, and we currently need complete representations of both
     // files to do anything reasonable. If we only have parts of the files,
     // don't use the "ignore all" algorithm.
     if ($ignore_all) {
       $hunks = $changeset->getHunks();
       if (count($hunks) !== 1) {
         $ignore_all = false;
       } else {
         $first_hunk = reset($hunks);
         if ($first_hunk->getOldOffset() != 1 ||
             $first_hunk->getNewOffset() != 1) {
             $ignore_all = false;
         }
       }
     }
 
     if ($ignore_all) {
       $old_file = $changeset->makeOldFile();
       $new_file = $changeset->makeNewFile();
       if ($old_file == $new_file) {
         // If the old and new files are exactly identical, the synthetic
         // diff below will give us nonsense and whitespace modes are
         // irrelevant anyway. This occurs when you, e.g., copy a file onto
         // itself in Subversion (see T271).
         $ignore_all = false;
       }
     }
 
     $hunk_parser = new DifferentialHunkParser();
     $hunk_parser->setWhitespaceMode($whitespace_mode);
     $hunk_parser->parseHunksForLineData($changeset->getHunks());
 
     // Depending on the whitespace mode, we may need to compute a different
     // set of changes than the set of changes in the hunk data (specificaly,
     // we might want to consider changed lines which have only whitespace
     // changes as unchanged).
     if ($ignore_all) {
       $engine = new PhabricatorDifferenceEngine();
       $engine->setIgnoreWhitespace(true);
       $no_whitespace_changeset = $engine->generateChangesetFromFileContent(
         $old_file,
         $new_file);
 
       $type_parser = new DifferentialHunkParser();
       $type_parser->parseHunksForLineData($no_whitespace_changeset->getHunks());
 
       $hunk_parser->setOldLineTypeMap($type_parser->getOldLineTypeMap());
       $hunk_parser->setNewLineTypeMap($type_parser->getNewLineTypeMap());
     }
 
     $hunk_parser->reparseHunksForSpecialAttributes();
 
     $unchanged = false;
     if (!$hunk_parser->getHasAnyChanges()) {
       $filetype = $this->changeset->getFileType();
       if ($filetype == DifferentialChangeType::FILE_TEXT ||
           $filetype == DifferentialChangeType::FILE_SYMLINK) {
         $unchanged = true;
       }
     }
 
     $changetype = $this->changeset->getChangeType();
     if ($changetype == DifferentialChangeType::TYPE_MOVE_AWAY) {
       // sometimes we show moved files as unchanged, sometimes deleted,
       // and sometimes inconsistent with what actually happened at the
-      // destination of the move.  Rather than make a false claim,
+      // destination of the move. Rather than make a false claim,
       // omit the 'not changed' notice if this is the source of a move
       $unchanged = false;
     }
 
     $this->setSpecialAttributes(array(
       self::ATTR_UNCHANGED  => $unchanged,
       self::ATTR_DELETED    => $hunk_parser->getIsDeleted(),
       self::ATTR_WHITELINES => !$hunk_parser->getHasTextChanges(),
     ));
 
     $hunk_parser->generateIntraLineDiffs();
     $hunk_parser->generateVisibileLinesMask();
 
     $this->setOldLines($hunk_parser->getOldLines());
     $this->setNewLines($hunk_parser->getNewLines());
     $this->setIntraLineDiffs($hunk_parser->getIntraLineDiffs());
     $this->setVisibileLinesMask($hunk_parser->getVisibleLinesMask());
     $this->hunkStartLines = $hunk_parser->getHunkStartLines(
       $changeset->getHunks());
 
     $new_corpus = $hunk_parser->getNewCorpus();
     $new_corpus_block = implode('', $new_corpus);
     $this->markGenerated($new_corpus_block);
 
     if ($this->isTopLevel &&
         !$this->comments &&
           ($this->isGenerated() ||
            $this->isUnchanged() ||
            $this->isDeleted())) {
       return;
     }
 
     $old_corpus = $hunk_parser->getOldCorpus();
     $old_corpus_block = implode('', $old_corpus);
     $old_future = $this->getHighlightFuture($old_corpus_block);
     $new_future = $this->getHighlightFuture($new_corpus_block);
     $futures = array(
       'old' => $old_future,
       'new' => $new_future,
     );
     $corpus_blocks = array(
       'old' => $old_corpus_block,
       'new' => $new_corpus_block,
     );
 
     $this->highlightErrors = false;
     foreach (Futures($futures) as $key => $future) {
       try {
         try {
           $highlighted = $future->resolve();
         } catch (PhutilSyntaxHighlighterException $ex) {
           $this->highlightErrors = true;
           $highlighted = id(new PhutilDefaultSyntaxHighlighter())
             ->getHighlightFuture($corpus_blocks[$key])
             ->resolve();
         }
         switch ($key) {
         case 'old':
           $this->oldRender = $this->processHighlightedSource(
             $this->old,
             $highlighted);
           break;
         case 'new':
           $this->newRender = $this->processHighlightedSource(
             $this->new,
             $highlighted);
           break;
         }
       } catch (Exception $ex) {
         phlog($ex);
         throw $ex;
       }
     }
 
     $this->applyIntraline(
       $this->oldRender,
       ipull($this->intra, 0),
       $old_corpus);
     $this->applyIntraline(
       $this->newRender,
       ipull($this->intra, 1),
       $new_corpus);
   }
 
   private function shouldRenderPropertyChangeHeader($changeset) {
     if (!$this->isTopLevel) {
       // We render properties only at top level; otherwise we get multiple
       // copies of them when a user clicks "Show More".
       return false;
     }
 
     $old = $changeset->getOldProperties();
     $new = $changeset->getNewProperties();
 
     if ($old === $new) {
       return false;
     }
 
     if ($changeset->getChangeType() == DifferentialChangeType::TYPE_ADD &&
         $new == array('unix:filemode' => '100644')) {
       return false;
     }
 
     if ($changeset->getChangeType() == DifferentialChangeType::TYPE_DELETE &&
         $old == array('unix:filemode' => '100644')) {
       return false;
     }
     return true;
   }
 
   public function render(
     $range_start  = null,
     $range_len    = null,
     $mask_force   = array()) {
 
     // "Top level" renders are initial requests for the whole file, versus
     // requests for a specific range generated by clicking "show more". We
     // generate property changes and "shield" UI elements only for toplevel
     // requests.
     $this->isTopLevel = (($range_start === null) && ($range_len === null));
     $this->highlightEngine = PhabricatorSyntaxHighlighter::newEngine();
 
     $encoding = null;
     if ($this->characterEncoding) {
       // We are forcing this changeset to be interpreted with a specific
       // character encoding, so force all the hunks into that encoding and
       // propagate it to the renderer.
       $encoding = $this->characterEncoding;
       foreach ($this->changeset->getHunks() as $hunk) {
         $hunk->forceEncoding($this->characterEncoding);
       }
     } else {
       // We're just using the default, so tell the renderer what that is
       // (by reading the encoding from the first hunk).
       foreach ($this->changeset->getHunks() as $hunk) {
         $encoding = $hunk->getDataEncoding();
         break;
       }
     }
 
     $this->tryCacheStuff();
     $render_pch = $this->shouldRenderPropertyChangeHeader($this->changeset);
 
     $rows = max(
       count($this->old),
       count($this->new));
 
     $renderer = $this->getRenderer()
       ->setChangeset($this->changeset)
       ->setRenderPropertyChangeHeader($render_pch)
       ->setIsTopLevel($this->isTopLevel)
       ->setOldRender($this->oldRender)
       ->setNewRender($this->newRender)
       ->setHunkStartLines($this->hunkStartLines)
       ->setOldChangesetID($this->leftSideChangesetID)
       ->setNewChangesetID($this->rightSideChangesetID)
       ->setOldAttachesToNewFile($this->leftSideAttachesToNewFile)
       ->setNewAttachesToNewFile($this->rightSideAttachesToNewFile)
       ->setCodeCoverage($this->getCoverage())
       ->setRenderingReference($this->getRenderingReference())
       ->setMarkupEngine($this->markupEngine)
       ->setHandles($this->handles)
       ->setOldLines($this->old)
       ->setNewLines($this->new)
       ->setOriginalCharacterEncoding($encoding);
 
     if ($this->user) {
       $renderer->setUser($this->user);
     }
 
     $shield = null;
     if ($this->isTopLevel && !$this->comments) {
       if ($this->isGenerated()) {
         $shield = $renderer->renderShield(
           pht(
             'This file contains generated code, which does not normally '.
             'need to be reviewed.'));
       } else if ($this->isUnchanged()) {
         $type = 'text';
         if (!$rows) {
           // NOTE: Normally, diffs which don't change files do not include
           // file content (for example, if you "chmod +x" a file and then
           // run "git show", the file content is not available). Similarly,
           // if you move a file from A to B without changing it, diffs normally
           // do not show the file content. In some cases `arc` is able to
           // synthetically generate content for these diffs, but for raw diffs
           // we'll never have it so we need to be prepared to not render a link.
           $type = 'none';
         }
         $shield = $renderer->renderShield(
           pht('The contents of this file were not changed.'),
           $type);
       } else if ($this->isWhitespaceOnly()) {
         $shield = $renderer->renderShield(
           pht('This file was changed only by adding or removing whitespace.'),
           'whitespace');
       } else if ($this->isDeleted()) {
         $shield = $renderer->renderShield(
           pht('This file was completely deleted.'));
       } else if ($this->changeset->getAffectedLineCount() > 2500) {
         $lines = number_format($this->changeset->getAffectedLineCount());
         $shield = $renderer->renderShield(
           pht(
             'This file has a very large number of changes (%s lines).',
             $lines));
       }
     }
 
     if ($shield) {
       return $renderer->renderChangesetTable($shield);
     }
 
     $old_comments = array();
     $new_comments = array();
     $old_mask = array();
     $new_mask = array();
     $feedback_mask = array();
 
     if ($this->comments) {
       foreach ($this->comments as $comment) {
         $start = max($comment->getLineNumber() - self::LINES_CONTEXT, 0);
         $end = $comment->getLineNumber() +
           $comment->getLineLength() +
           self::LINES_CONTEXT;
         $new_side = $this->isCommentOnRightSideWhenDisplayed($comment);
         for ($ii = $start; $ii <= $end; $ii++) {
           if ($new_side) {
             $new_mask[$ii] = true;
           } else {
             $old_mask[$ii] = true;
           }
         }
       }
 
       foreach ($this->old as $ii => $old) {
         if (isset($old['line']) && isset($old_mask[$old['line']])) {
           $feedback_mask[$ii] = true;
         }
       }
 
       foreach ($this->new as $ii => $new) {
         if (isset($new['line']) && isset($new_mask[$new['line']])) {
           $feedback_mask[$ii] = true;
         }
       }
       $this->comments = msort($this->comments, 'getID');
       foreach ($this->comments as $comment) {
         $final = $comment->getLineNumber() +
           $comment->getLineLength();
         $final = max(1, $final);
         if ($this->isCommentOnRightSideWhenDisplayed($comment)) {
           $new_comments[$final][] = $comment;
         } else {
           $old_comments[$final][] = $comment;
         }
       }
     }
     $renderer
       ->setOldComments($old_comments)
       ->setNewComments($new_comments);
 
     switch ($this->changeset->getFileType()) {
       case DifferentialChangeType::FILE_IMAGE:
         $old = null;
         $new = null;
         // TODO: Improve the architectural issue as discussed in D955
         // https://secure.phabricator.com/D955
         $reference = $this->getRenderingReference();
         $parts = explode('/', $reference);
         if (count($parts) == 2) {
           list($id, $vs) = $parts;
         } else {
           $id = $parts[0];
           $vs = 0;
         }
         $id = (int)$id;
         $vs = (int)$vs;
 
         if (!$vs) {
           $metadata = $this->changeset->getMetadata();
           $data = idx($metadata, 'attachment-data');
 
           $old_phid = idx($metadata, 'old:binary-phid');
           $new_phid = idx($metadata, 'new:binary-phid');
         } else {
           $vs_changeset = id(new DifferentialChangeset())->load($vs);
           $old_phid = null;
           $new_phid = null;
 
           // TODO: This is spooky, see D6851
           if ($vs_changeset) {
             $vs_metadata = $vs_changeset->getMetadata();
             $old_phid = idx($vs_metadata, 'new:binary-phid');
           }
 
           $changeset = id(new DifferentialChangeset())->load($id);
           if ($changeset) {
             $metadata = $changeset->getMetadata();
             $new_phid = idx($metadata, 'new:binary-phid');
           }
         }
 
         if ($old_phid || $new_phid) {
           // grab the files, (micro) optimization for 1 query not 2
           $file_phids = array();
           if ($old_phid) {
             $file_phids[] = $old_phid;
           }
           if ($new_phid) {
             $file_phids[] = $new_phid;
           }
 
           // TODO: (T603) Probably fine to use omnipotent viewer here?
           $files = id(new PhabricatorFile())->loadAllWhere(
             'phid IN (%Ls)',
             $file_phids);
           foreach ($files as $file) {
             if (empty($file)) {
               continue;
             }
             if ($file->getPHID() == $old_phid) {
               $old = $file;
             } else if ($file->getPHID() == $new_phid) {
               $new = $file;
             }
           }
         }
 
         return $renderer->renderFileChange($old, $new, $id, $vs);
       case DifferentialChangeType::FILE_DIRECTORY:
       case DifferentialChangeType::FILE_BINARY:
         $output = $renderer->renderChangesetTable(null);
         return $output;
     }
 
     if ($this->originalLeft && $this->originalRight) {
       list($highlight_old, $highlight_new) = $this->diffOriginals();
       $highlight_old = array_flip($highlight_old);
       $highlight_new = array_flip($highlight_new);
       $renderer
         ->setHighlightOld($highlight_old)
         ->setHighlightNew($highlight_new);
     }
     $renderer
       ->setOriginalOld($this->originalLeft)
       ->setOriginalNew($this->originalRight);
 
     if ($range_start === null) {
       $range_start = 0;
     }
     if ($range_len === null) {
       $range_len = $rows;
     }
     $range_len = min($range_len, $rows - $range_start);
 
     list($gaps, $mask, $depths) = $this->calculateGapsMaskAndDepths(
       $mask_force,
       $feedback_mask,
       $range_start,
       $range_len);
 
     $renderer
       ->setGaps($gaps)
       ->setMask($mask)
       ->setDepths($depths);
 
     $html = $renderer->renderTextChange(
       $range_start,
       $range_len,
       $rows);
 
     return $renderer->renderChangesetTable($html);
   }
 
   /**
    * This function calculates a lot of stuff we need to know to display
    * the diff:
    *
    * Gaps - compute gaps in the visible display diff, where we will render
    * "Show more context" spacers. If a gap is smaller than the context size,
    * we just display it. Otherwise, we record it into $gaps and will render a
    * "show more context" element instead of diff text below. A given $gap
    * is a tuple of $gap_line_number_start and $gap_length.
    *
    * Mask - compute the actual lines that need to be shown (because they
    * are near changes lines, near inline comments, or the request has
    * explicitly asked for them, i.e. resulting from the user clicking
    * "show more"). The $mask returned is a sparesely populated dictionary
    * of $visible_line_number => true.
    *
    * Depths - compute how indented any given line is. The $depths returned
    * is a sparesely populated dictionary of $visible_line_number => $depth.
    *
    * This function also has the side effect of modifying member variable
    * new such that tabs are normalized to spaces for each line of the diff.
    *
    * @return array($gaps, $mask, $depths)
    */
   private function calculateGapsMaskAndDepths($mask_force,
                                               $feedback_mask,
                                               $range_start,
                                               $range_len) {
 
     // Calculate gaps and mask first
     $gaps = array();
     $gap_start = 0;
     $in_gap = false;
     $base_mask = $this->visible + $mask_force + $feedback_mask;
     $base_mask[$range_start + $range_len] = true;
     for ($ii = $range_start; $ii <= $range_start + $range_len; $ii++) {
       if (isset($base_mask[$ii])) {
         if ($in_gap) {
           $gap_length = $ii - $gap_start;
           if ($gap_length <= self::LINES_CONTEXT) {
             for ($jj = $gap_start; $jj <= $gap_start + $gap_length; $jj++) {
               $base_mask[$jj] = true;
             }
           } else {
             $gaps[] = array($gap_start, $gap_length);
           }
           $in_gap = false;
         }
       } else {
         if (!$in_gap) {
           $gap_start = $ii;
           $in_gap = true;
         }
       }
     }
     $gaps = array_reverse($gaps);
     $mask = $base_mask;
 
     // Time to calculate depth.
     // We need to go backwards to properly indent whitespace in this code:
     //
     //   0: class C {
     //   1:
     //   1:   function f() {
     //   2:
     //   2:     return;
     //   1:
     //   1:   }
     //   0:
     //   0: }
     //
     $depths = array();
     $last_depth = 0;
     $range_end = $range_start + $range_len;
     if (!isset($this->new[$range_end])) {
       $range_end--;
     }
     for ($ii = $range_end; $ii >= $range_start; $ii--) {
       // We need to expand tabs to process mixed indenting and to round
       // correctly later.
       $line = str_replace("\t", '  ', $this->new[$ii]['text']);
       $trimmed = ltrim($line);
       if ($trimmed != '') {
         // We round down to flatten "/**" and " *".
         $last_depth = floor((strlen($line) - strlen($trimmed)) / 2);
       }
       $depths[$ii] = $last_depth;
     }
 
     return array($gaps, $mask, $depths);
   }
 
   /**
    * Determine if an inline comment will appear on the rendered diff,
    * taking into consideration which halves of which changesets will actually
    * be shown.
    *
    * @param PhabricatorInlineCommentInterface Comment to test for visibility.
    * @return bool True if the comment is visible on the rendered diff.
    */
   private function isCommentVisibleOnRenderedDiff(
     PhabricatorInlineCommentInterface $comment) {
 
     $changeset_id = $comment->getChangesetID();
     $is_new = $comment->getIsNewFile();
 
     if ($changeset_id == $this->rightSideChangesetID &&
         $is_new == $this->rightSideAttachesToNewFile) {
         return true;
     }
 
     if ($changeset_id == $this->leftSideChangesetID &&
         $is_new == $this->leftSideAttachesToNewFile) {
         return true;
     }
 
     return false;
   }
 
 
   /**
    * Determine if a comment will appear on the right side of the display diff.
    * Note that the comment must appear somewhere on the rendered changeset, as
    * per isCommentVisibleOnRenderedDiff().
    *
    * @param PhabricatorInlineCommentInterface Comment to test for display
    *              location.
    * @return bool True for right, false for left.
    */
   private function isCommentOnRightSideWhenDisplayed(
     PhabricatorInlineCommentInterface $comment) {
 
     if (!$this->isCommentVisibleOnRenderedDiff($comment)) {
       throw new Exception('Comment is not visible on changeset!');
     }
 
     $changeset_id = $comment->getChangesetID();
     $is_new = $comment->getIsNewFile();
 
     if ($changeset_id == $this->rightSideChangesetID &&
         $is_new == $this->rightSideAttachesToNewFile) {
       return true;
     }
 
     return false;
   }
 
   /**
    * Parse the 'range' specification that this class and the client-side JS
    * emit to indicate that a user clicked "Show more..." on a diff. Generally,
    * use is something like this:
    *
    *   $spec = $request->getStr('range');
    *   $parsed = DifferentialChangesetParser::parseRangeSpecification($spec);
    *   list($start, $end, $mask) = $parsed;
    *   $parser->render($start, $end, $mask);
    *
    * @param string Range specification, indicating the range of the diff that
    *               should be rendered.
    * @return tuple List of <start, end, mask> suitable for passing to
    *               @{method:render}.
    */
   public static function parseRangeSpecification($spec) {
     $range_s = null;
     $range_e = null;
     $mask = array();
 
     if ($spec) {
       $match = null;
       if (preg_match('@^(\d+)-(\d+)(?:/(\d+)-(\d+))?$@', $spec, $match)) {
         $range_s = (int)$match[1];
         $range_e = (int)$match[2];
         if (count($match) > 3) {
           $start = (int)$match[3];
           $len = (int)$match[4];
           for ($ii = $start; $ii < $start + $len; $ii++) {
             $mask[$ii] = true;
           }
         }
       }
     }
 
     return array($range_s, $range_e, $mask);
   }
 
   /**
    * Render "modified coverage" information; test coverage on modified lines.
    * This synthesizes diff information with unit test information into a useful
    * indicator of how well tested a change is.
    */
   public function renderModifiedCoverage() {
     $na = phutil_tag('em', array(), '-');
 
     $coverage = $this->getCoverage();
     if (!$coverage) {
       return $na;
     }
 
     $covered = 0;
     $not_covered = 0;
 
     foreach ($this->new as $k => $new) {
       if (!$new['line']) {
         continue;
       }
 
       if (!$new['type']) {
         continue;
       }
 
       if (empty($coverage[$new['line'] - 1])) {
         continue;
       }
 
       switch ($coverage[$new['line'] - 1]) {
         case 'C':
           $covered++;
           break;
         case 'U':
           $not_covered++;
           break;
       }
     }
 
     if (!$covered && !$not_covered) {
       return $na;
     }
 
     return sprintf('%d%%', 100 * ($covered / ($covered + $not_covered)));
   }
 
   public function detectCopiedCode(
     array $changesets,
     $min_width = 30,
     $min_lines = 3) {
 
     assert_instances_of($changesets, 'DifferentialChangeset');
 
     $map = array();
     $files = array();
     $types = array();
     foreach ($changesets as $changeset) {
       $file = $changeset->getFilename();
       foreach ($changeset->getHunks() as $hunk) {
         $line = $hunk->getOldOffset();
         foreach (explode("\n", $hunk->getChanges()) as $code) {
           $type = (isset($code[0]) ? $code[0] : '');
           if ($type == '-' || $type == ' ') {
             $code = trim(substr($code, 1));
             $files[$file][$line] = $code;
             $types[$file][$line] = $type;
             if (strlen($code) >= $min_width) {
               $map[$code][] = array($file, $line);
             }
             $line++;
           }
         }
       }
     }
 
     foreach ($changesets as $changeset) {
       $copies = array();
       foreach ($changeset->getHunks() as $hunk) {
         $added = array_map('trim', $hunk->getAddedLines());
         for (reset($added); list($line, $code) = each($added); ) {
           if (isset($map[$code])) { // We found a long matching line.
 
             if (count($map[$code]) > 16) {
               // If there are a large number of identical lines in this diff,
               // don't try to figure out where this block came from: the
               // analysis is O(N^2), since we need to compare every line
               // against every other line. Even if we arrive at a result, it
               // is unlikely to be meaningful. See T5041.
               continue 2;
             }
 
             $best_length = 0;
             foreach ($map[$code] as $val) { // Explore all candidates.
               list($file, $orig_line) = $val;
               $length = 1;
               // Search also backwards for short lines.
               foreach (array(-1, 1) as $direction) {
                 $offset = $direction;
                 while (!isset($copies[$line + $offset]) &&
                     isset($added[$line + $offset]) &&
                     idx($files[$file], $orig_line + $offset) ===
                       $added[$line + $offset]) {
                   $length++;
                   $offset += $direction;
                 }
               }
               if ($length > $best_length ||
                   ($length == $best_length && // Prefer moves.
                    idx($types[$file], $orig_line) == '-')) {
                 $best_length = $length;
                 // ($offset - 1) contains number of forward matching lines.
                 $best_offset = $offset - 1;
                 $best_file = $file;
                 $best_line = $orig_line;
               }
             }
             $file = ($best_file == $changeset->getFilename() ? '' : $best_file);
             for ($i = $best_length; $i--; ) {
               $type = idx($types[$best_file], $best_line + $best_offset - $i);
               $copies[$line + $best_offset - $i] = ($best_length < $min_lines
                 ? array() // Ignore short blocks.
                 : array($file, $best_line + $best_offset - $i, $type));
             }
             for ($i = 0; $i < $best_offset; $i++) {
               next($added);
             }
           }
         }
       }
       $copies = array_filter($copies);
       if ($copies) {
         $metadata = $changeset->getMetadata();
         $metadata['copy:lines'] = $copies;
         $changeset->setMetadata($metadata);
       }
     }
     return $changesets;
   }
 
 }
diff --git a/src/applications/differential/remarkup/DifferentialRemarkupRule.php b/src/applications/differential/remarkup/DifferentialRemarkupRule.php
index 1535463a29..9fe9e4fdd6 100644
--- a/src/applications/differential/remarkup/DifferentialRemarkupRule.php
+++ b/src/applications/differential/remarkup/DifferentialRemarkupRule.php
@@ -1,21 +1,17 @@
 <?php
 
-/**
- * @group differential
- */
-final class DifferentialRemarkupRule
-  extends PhabricatorRemarkupRuleObject {
+final class DifferentialRemarkupRule extends PhabricatorRemarkupRuleObject {
 
   protected function getObjectNamePrefix() {
     return 'D';
   }
 
   protected function loadObjects(array $ids) {
     $viewer = $this->getEngine()->getConfig('viewer');
     return id(new DifferentialRevisionQuery())
       ->setViewer($viewer)
       ->withIDs($ids)
       ->execute();
   }
 
 }
diff --git a/src/applications/differential/storage/DifferentialAffectedPath.php b/src/applications/differential/storage/DifferentialAffectedPath.php
index 83b35f5639..ac0e9c23ec 100644
--- a/src/applications/differential/storage/DifferentialAffectedPath.php
+++ b/src/applications/differential/storage/DifferentialAffectedPath.php
@@ -1,21 +1,20 @@
 <?php
 
 /**
  * Denormalized index table which stores relationships between revisions in
  * Differential and paths in Diffusion.
- *
- * @group differential
  */
 final class DifferentialAffectedPath extends DifferentialDAO {
 
   protected $repositoryID;
   protected $pathID;
   protected $epoch;
   protected $revisionID;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_TIMESTAMPS => false,
     ) + parent::getConfiguration();
   }
+
 }
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_Method.php
index cdae68c5d6..3db8cbeaf9 100644
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_Method.php
@@ -1,14 +1,10 @@
 <?php
 
-/**
- * @group conduit
- */
-abstract class ConduitAPI_diffusion_Method
-  extends ConduitAPIMethod {
+abstract class ConduitAPI_diffusion_Method extends ConduitAPIMethod {
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
       'PhabricatorApplicationDiffusion');
   }
 
 }
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_abstractquery_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_abstractquery_Method.php
index c93c124783..c22df6a073 100644
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_abstractquery_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_abstractquery_Method.php
@@ -1,132 +1,132 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class ConduitAPI_diffusion_abstractquery_Method
   extends ConduitAPI_diffusion_Method {
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodStatusDescription() {
     return pht(
       'See T2784 - migrating diffusion working copy calls to conduit methods. '.
       'Until that task is completed (and possibly after) these methods are '.
       'unstable.');
   }
 
   private $diffusionRequest;
   private $repository;
 
   protected function setDiffusionRequest(DiffusionRequest $request) {
     $this->diffusionRequest = $request;
     return $this;
   }
 
   protected function getDiffusionRequest() {
     return $this->diffusionRequest;
   }
 
   protected function getRepository(ConduitAPIRequest $request) {
     return $this->getDiffusionRequest()->getRepository();
   }
 
   final public function defineErrorTypes() {
     return $this->defineCustomErrorTypes() +
       array(
         'ERR-UNKNOWN-REPOSITORY' =>
           pht('There is no repository with that callsign.'),
         'ERR-UNKNOWN-VCS-TYPE' =>
           pht('Unknown repository VCS type.'),
         'ERR-UNSUPPORTED-VCS' =>
           pht('VCS is not supported for this method.'));
   }
+
   /**
    * Subclasses should override this to specify custom error types.
    */
   protected function defineCustomErrorTypes() {
     return array();
   }
 
   final public function defineParamTypes() {
     return $this->defineCustomParamTypes() +
       array(
         'callsign' => 'required string',
         'branch' => 'optional string',
       );
   }
+
   /**
    * Subclasses should override this to specify custom param types.
    */
   protected function defineCustomParamTypes() {
     return array();
   }
 
   /**
    * Subclasses should override these methods with the proper result for the
    * pertinent version control system, e.g. getGitResult for Git.
    *
    * If the result is not supported for that VCS, do not implement it. e.g.
    * Subversion (SVN) does not support branches.
    */
   protected function getGitResult(ConduitAPIRequest $request) {
     throw new ConduitException('ERR-UNSUPPORTED-VCS');
   }
   protected function getSVNResult(ConduitAPIRequest $request) {
     throw new ConduitException('ERR-UNSUPPORTED-VCS');
   }
   protected function getMercurialResult(ConduitAPIRequest $request) {
     throw new ConduitException('ERR-UNSUPPORTED-VCS');
   }
 
   /**
    * This method is final because most queries will need to construct a
    * @{class:DiffusionRequest} and use it. Consolidating this codepath and
    * enforcing @{method:getDiffusionRequest} works when we need it is good.
    *
    * @{method:getResult} should be overridden by subclasses as necessary, e.g.
    * there is a common operation across all version control systems that
    * should occur after @{method:getResult}, like formatting a timestamp.
    */
   final protected function execute(ConduitAPIRequest $request) {
     $drequest = DiffusionRequest::newFromDictionary(
       array(
         'user' => $request->getUser(),
         'callsign' => $request->getValue('callsign'),
         'branch' => $request->getValue('branch'),
         'path' => $request->getValue('path'),
         'commit' => $request->getValue('commit'),
         'initFromConduit' => false,
       ));
 
     $this->setDiffusionRequest($drequest);
 
     return $this->getResult($request);
   }
 
   protected function getResult(ConduitAPIRequest $request) {
     $repository = $this->getRepository($request);
     $result = null;
     switch ($repository->getVersionControlSystem()) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         $result = $this->getGitResult($request);
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
         $result = $this->getMercurialResult($request);
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
         $result = $this->getSVNResult($request);
         break;
       default:
         throw new ConduitException('ERR-UNKNOWN-VCS-TYPE');
         break;
     }
     return $result;
   }
+
 }
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_browsequery_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_browsequery_Method.php
index 35fadde7f6..ddd1ad7e95 100644
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_browsequery_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_browsequery_Method.php
@@ -1,470 +1,467 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_diffusion_browsequery_Method
   extends ConduitAPI_diffusion_abstractquery_Method {
 
   public function getMethodDescription() {
     return
       'File(s) information for a repository at an (optional) path and '.
       '(optional) commit.';
   }
 
   public function defineReturnType() {
     return 'array';
   }
 
   protected function defineCustomParamTypes() {
     return array(
       'path' => 'optional string',
       'commit' => 'optional string',
       'needValidityOnly' => 'optional bool',
     );
   }
 
   protected function getResult(ConduitAPIRequest $request) {
     $result = parent::getResult($request);
     return $result->toDictionary();
   }
 
   protected function getGitResult(ConduitAPIRequest $request) {
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
     $path = $request->getValue('path');
     $commit = $request->getValue('commit');
     $result = $this->getEmptyResultSet();
 
     if ($path == '') {
       // Fast path to improve the performance of the repository view; we know
       // the root is always a tree at any commit and always exists.
       $stdout = 'tree';
     } else {
       try {
         list($stdout) = $repository->execxLocalCommand(
           'cat-file -t %s:%s',
           $commit,
           $path);
       } catch (CommandException $e) {
         $stderr = $e->getStdErr();
         if (preg_match('/^fatal: Not a valid object name/', $stderr)) {
           // Grab two logs, since the first one is when the object was deleted.
           list($stdout) = $repository->execxLocalCommand(
             'log -n2 --format="%%H" %s -- %s',
             $commit,
             $path);
           $stdout = trim($stdout);
           if ($stdout) {
             $commits = explode("\n", $stdout);
             $result
               ->setReasonForEmptyResultSet(
                 DiffusionBrowseResultSet::REASON_IS_DELETED)
               ->setDeletedAtCommit(idx($commits, 0))
               ->setExistedAtCommit(idx($commits, 1));
             return $result;
           }
 
           $result->setReasonForEmptyResultSet(
             DiffusionBrowseResultSet::REASON_IS_NONEXISTENT);
           return $result;
         } else {
           throw $e;
         }
       }
     }
 
     if (trim($stdout) == 'blob') {
       $result->setReasonForEmptyResultSet(
         DiffusionBrowseResultSet::REASON_IS_FILE);
       return $result;
     }
 
     $result->setIsValidResults(true);
     if ($this->shouldOnlyTestValidity($request)) {
       return $result;
     }
 
     list($stdout) = $repository->execxLocalCommand(
       'ls-tree -z -l %s:%s',
       $commit,
       $path);
 
     $submodules = array();
 
     if (strlen($path)) {
       $prefix = rtrim($path, '/').'/';
     } else {
       $prefix = '';
     }
 
     $results = array();
     foreach (explode("\0", rtrim($stdout)) as $line) {
       // NOTE: Limit to 5 components so we parse filenames with spaces in them
       // correctly.
       // NOTE: The output uses a mixture of tabs and one-or-more spaces to
       // delimit fields.
       $parts = preg_split('/\s+/', $line, 5);
       if (count($parts) < 5) {
         throw new Exception(
           pht(
             'Expected "<mode> <type> <hash> <size>\t<name>", for ls-tree of '.
             '"%s:%s", got: %s',
             $commit,
             $path,
             $line));
       }
 
       list($mode, $type, $hash, $size, $name) = $parts;
 
       $path_result = new DiffusionRepositoryPath();
 
       if ($type == 'tree') {
         $file_type = DifferentialChangeType::FILE_DIRECTORY;
       } else if ($type == 'commit') {
         $file_type = DifferentialChangeType::FILE_SUBMODULE;
         $submodules[] = $path_result;
       } else {
         $mode = intval($mode, 8);
         if (($mode & 0120000) == 0120000) {
           $file_type = DifferentialChangeType::FILE_SYMLINK;
         } else {
           $file_type = DifferentialChangeType::FILE_NORMAL;
         }
       }
 
       $path_result->setFullPath($prefix.$name);
       $path_result->setPath($name);
       $path_result->setHash($hash);
       $path_result->setFileType($file_type);
       $path_result->setFileSize($size);
 
       $results[] = $path_result;
     }
 
     // If we identified submodules, lookup the module info at this commit to
     // find their source URIs.
 
     if ($submodules) {
 
       // NOTE: We need to read the file out of git and write it to a temporary
       // location because "git config -f" doesn't accept a "commit:path"-style
       // argument.
 
       // NOTE: This file may not exist, e.g. because the commit author removed
       // it when they added the submodule. See T1448. If it's not present, just
       // show the submodule without enriching it. If ".gitmodules" was removed
       // it seems to partially break submodules, but the repository as a whole
       // continues to work fine and we've seen at least two cases of this in
       // the wild.
 
       list($err, $contents) = $repository->execLocalCommand(
         'cat-file blob %s:.gitmodules',
         $commit);
 
       if (!$err) {
         $tmp = new TempFile();
         Filesystem::writeFile($tmp, $contents);
         list($module_info) = $repository->execxLocalCommand(
           'config -l -f %s',
           $tmp);
 
         $dict = array();
         $lines = explode("\n", trim($module_info));
         foreach ($lines as $line) {
           list($key, $value) = explode('=', $line, 2);
           $parts = explode('.', $key);
           $dict[$key] = $value;
         }
 
         foreach ($submodules as $path) {
           $full_path = $path->getFullPath();
           $key = 'submodule.'.$full_path.'.url';
           if (isset($dict[$key])) {
             $path->setExternalURI($dict[$key]);
           }
         }
       }
     }
 
     return $result->setPaths($results);
   }
 
   protected function getMercurialResult(ConduitAPIRequest $request) {
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
     $path = $request->getValue('path');
     $commit = $request->getValue('commit');
     $result = $this->getEmptyResultSet();
 
     $match_against = trim($path, '/');
 
     $prefix = trim('./'.$match_against, '/');
 
     list($entire_manifest) = $repository->execxLocalCommand(
       'locate --print0 --rev %s -I %s',
       hgsprintf('%s', $commit),
       $prefix);
     $entire_manifest = explode("\0", $entire_manifest);
 
     $results = array();
 
     $match_len = strlen($match_against);
 
     // For the root, don't trim. For other paths, trim the "/" after we match.
     // We need this because Mercurial's canonical paths have no leading "/",
     // but ours do.
     $trim_len = $match_len ? $match_len + 1 : 0;
 
     foreach ($entire_manifest as $path) {
       if (strncmp($path, $match_against, $match_len)) {
         continue;
       }
       if (!strlen($path)) {
         continue;
       }
       $remainder = substr($path, $trim_len);
       if (!strlen($remainder)) {
         // There is a file with this exact name in the manifest, so clearly
         // it's a file.
         $result->setReasonForEmptyResultSet(
           DiffusionBrowseResultSet::REASON_IS_FILE);
         return $result;
       }
       $parts = explode('/', $remainder);
       if (count($parts) == 1) {
         $type = DifferentialChangeType::FILE_NORMAL;
       } else {
         $type = DifferentialChangeType::FILE_DIRECTORY;
       }
       $results[reset($parts)] = $type;
     }
 
     foreach ($results as $key => $type) {
       $path_result = new DiffusionRepositoryPath();
       $path_result->setPath($key);
       $path_result->setFileType($type);
       $path_result->setFullPath(ltrim($match_against.'/', '/').$key);
 
       $results[$key] = $path_result;
     }
 
     $valid_results = true;
     if (empty($results)) {
       // TODO: Detect "deleted" by issuing "hg log"?
       $result->setReasonForEmptyResultSet(
         DiffusionBrowseResultSet::REASON_IS_NONEXISTENT);
       $valid_results = false;
     }
 
     return $result
       ->setPaths($results)
       ->setIsValidResults($valid_results);
   }
 
   protected function getSVNResult(ConduitAPIRequest $request) {
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
     $path = $request->getValue('path');
     $commit = $request->getValue('commit');
     $result = $this->getEmptyResultSet();
 
     $subpath = $repository->getDetail('svn-subpath');
     if ($subpath && strncmp($subpath, $path, strlen($subpath))) {
       // If we have a subpath and the path isn't a child of it, it (almost
       // certainly) won't exist since we don't track commits which affect
       // it. (Even if it exists, return a consistent result.)
       $result->setReasonForEmptyResultSet(
         DiffusionBrowseResultSet::REASON_IS_UNTRACKED_PARENT);
       return $result;
     }
 
     $conn_r = $repository->establishConnection('r');
 
     $parent_path = DiffusionPathIDQuery::getParentPath($path);
     $path_query = new DiffusionPathIDQuery(
       array(
         $path,
         $parent_path,
       ));
     $path_map = $path_query->loadPathIDs();
 
     $path_id = $path_map[$path];
     $parent_path_id = $path_map[$parent_path];
 
     if (empty($path_id)) {
       $result->setReasonForEmptyResultSet(
         DiffusionBrowseResultSet::REASON_IS_NONEXISTENT);
       return $result;
     }
 
     if ($commit) {
       $slice_clause = 'AND svnCommit <= '.(int)$commit;
     } else {
       $slice_clause = '';
     }
 
     $index = queryfx_all(
       $conn_r,
       'SELECT pathID, max(svnCommit) maxCommit FROM %T WHERE
         repositoryID = %d AND parentID = %d
         %Q GROUP BY pathID',
       PhabricatorRepository::TABLE_FILESYSTEM,
       $repository->getID(),
       $path_id,
       $slice_clause);
 
     if (!$index) {
       if ($path == '/') {
         $result->setReasonForEmptyResultSet(
           DiffusionBrowseResultSet::REASON_IS_EMPTY);
       } else {
 
         // NOTE: The parent path ID is included so this query can take
         // advantage of the table's primary key; it is uniquely determined by
         // the pathID but if we don't do the lookup ourselves MySQL doesn't have
         // the information it needs to avoid a table scan.
 
         $reasons = queryfx_all(
           $conn_r,
           'SELECT * FROM %T WHERE repositoryID = %d
               AND parentID = %d
               AND pathID = %d
             %Q ORDER BY svnCommit DESC LIMIT 2',
           PhabricatorRepository::TABLE_FILESYSTEM,
           $repository->getID(),
           $parent_path_id,
           $path_id,
           $slice_clause);
 
         $reason = reset($reasons);
 
         if (!$reason) {
           $result->setReasonForEmptyResultSet(
             DiffusionBrowseResultSet::REASON_IS_NONEXISTENT);
         } else {
           $file_type = $reason['fileType'];
           if (empty($reason['existed'])) {
             $result->setReasonForEmptyResultSet(
               DiffusionBrowseResultSet::REASON_IS_DELETED);
             $result->setDeletedAtCommit($reason['svnCommit']);
             if (!empty($reasons[1])) {
               $result->setExistedAtCommit($reasons[1]['svnCommit']);
             }
           } else if ($file_type == DifferentialChangeType::FILE_DIRECTORY) {
             $result->setReasonForEmptyResultSet(
               DiffusionBrowseResultSet::REASON_IS_EMPTY);
           } else {
             $result->setReasonForEmptyResultSet(
               DiffusionBrowseResultSet::REASON_IS_FILE);
           }
         }
       }
       return $result;
     }
 
     $result->setIsValidResults(true);
     if ($this->shouldOnlyTestValidity($request)) {
       return $result;
     }
 
     $sql = array();
     foreach ($index as $row) {
       $sql[] =
         '(pathID = '.(int)$row['pathID'].' AND '.
         'svnCommit = '.(int)$row['maxCommit'].')';
     }
 
     $browse = queryfx_all(
       $conn_r,
       'SELECT *, p.path pathName
         FROM %T f JOIN %T p ON f.pathID = p.id
         WHERE repositoryID = %d
           AND parentID = %d
           AND existed = 1
         AND (%Q)
         ORDER BY pathName',
       PhabricatorRepository::TABLE_FILESYSTEM,
       PhabricatorRepository::TABLE_PATH,
       $repository->getID(),
       $path_id,
       implode(' OR ', $sql));
 
     $loadable_commits = array();
     foreach ($browse as $key => $file) {
       // We need to strip out directories because we don't store last-modified
       // in the filesystem table.
       if ($file['fileType'] != DifferentialChangeType::FILE_DIRECTORY) {
         $loadable_commits[] = $file['svnCommit'];
         $browse[$key]['hasCommit'] = true;
       }
     }
 
     $commits = array();
     $commit_data = array();
     if ($loadable_commits) {
       // NOTE: Even though these are integers, use '%Ls' because MySQL doesn't
       // use the second part of the key otherwise!
       $commits = id(new PhabricatorRepositoryCommit())->loadAllWhere(
         'repositoryID = %d AND commitIdentifier IN (%Ls)',
         $repository->getID(),
         $loadable_commits);
       $commits = mpull($commits, null, 'getCommitIdentifier');
       if ($commits) {
         $commit_data = id(new PhabricatorRepositoryCommitData())->loadAllWhere(
           'commitID in (%Ld)',
           mpull($commits, 'getID'));
         $commit_data = mpull($commit_data, null, 'getCommitID');
       } else {
         $commit_data = array();
       }
     }
 
     $path_normal = DiffusionPathIDQuery::normalizePath($path);
 
     $results = array();
     foreach ($browse as $file) {
 
       $full_path = $file['pathName'];
       $file_path = ltrim(substr($full_path, strlen($path_normal)), '/');
       $full_path = ltrim($full_path, '/');
 
       $result_path = new DiffusionRepositoryPath();
       $result_path->setPath($file_path);
       $result_path->setFullPath($full_path);
 //      $result_path->setHash($hash);
       $result_path->setFileType($file['fileType']);
 //      $result_path->setFileSize($size);
 
       if (!empty($file['hasCommit'])) {
         $commit = idx($commits, $file['svnCommit']);
         if ($commit) {
           $data = idx($commit_data, $commit->getID());
           $result_path->setLastModifiedCommit($commit);
           $result_path->setLastCommitData($data);
         }
       }
 
       $results[] = $result_path;
     }
 
     if (empty($results)) {
       $result->setReasonForEmptyResultSet(
         DiffusionBrowseResultSet::REASON_IS_EMPTY);
     }
 
     return $result->setPaths($results);
   }
 
   private function getEmptyResultSet() {
     return id(new DiffusionBrowseResultSet())
       ->setPaths(array())
       ->setReasonForEmptyResultSet(null)
       ->setIsValidResults(false);
   }
 
   private function shouldOnlyTestValidity(ConduitAPIRequest $request) {
     return $request->getValue('needValidityOnly', false);
   }
 
 }
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_commitparentsquery_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_commitparentsquery_Method.php
index 82ff91a0ce..52d473c100 100644
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_commitparentsquery_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_commitparentsquery_Method.php
@@ -1,33 +1,30 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_diffusion_commitparentsquery_Method
   extends ConduitAPI_diffusion_abstractquery_Method {
 
   public function getMethodDescription() {
     return pht(
       "Get the commit identifiers for a commit's parent or parents.");
   }
 
   public function defineReturnType() {
     return 'list<string>';
   }
 
   protected function defineCustomParamTypes() {
     return array(
       'commit' => 'required string',
     );
   }
 
   protected function getResult(ConduitAPIRequest $request) {
     $repository = $this->getRepository($request);
 
     return id(new DiffusionLowLevelParentsQuery())
       ->setRepository($repository)
       ->withIdentifier($request->getValue('commit'))
       ->execute();
   }
 
 }
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_createcomment_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_createcomment_Method.php
index e4020a0d06..d63c9a3045 100644
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_createcomment_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_createcomment_Method.php
@@ -1,85 +1,82 @@
 <?php
 
-/**
- *@group conduit
- */
 final class ConduitAPI_diffusion_createcomment_Method
   extends ConduitAPI_diffusion_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_DEPRECATED;
   }
 
   public function getMethodDescription() {
     return 'Add a comment to a Diffusion commit. By specifying an action of '.
            '"concern", "accept", "resign", or "close", auditing actions can '.
            'be triggered. Defaults to "comment".';
   }
 
   public function defineParamTypes() {
     return array(
       'phid'    => 'required string',
       'action'  => 'optional string',
       'message' => 'required string',
       'silent'  => 'optional bool',
     );
   }
 
   public function defineReturnType() {
     return 'bool';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_BAD_COMMIT' => 'No commit found with that PHID',
       'ERR_BAD_ACTION' => 'Invalid action type',
       'ERR_MISSING_MESSAGE' => 'Message is required',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $commit_phid = $request->getValue('phid');
     $commit = id(new PhabricatorRepositoryCommit())->loadOneWhere(
       'phid = %s',
       $commit_phid);
 
     if (!$commit) {
       throw new ConduitException('ERR_BAD_COMMIT');
     }
 
     $message = trim($request->getValue('message'));
     if (!$message) {
       throw new ConduitException('ERR_MISSING_MESSAGE');
     }
 
     $action = $request->getValue('action');
     if (!$action) {
       $action = PhabricatorAuditActionConstants::COMMENT;
     }
 
     // Disallow ADD_CCS, ADD_AUDITORS for now
     if (!in_array($action, array(
       PhabricatorAuditActionConstants::CONCERN,
       PhabricatorAuditActionConstants::ACCEPT,
       PhabricatorAuditActionConstants::COMMENT,
       PhabricatorAuditActionConstants::RESIGN,
       PhabricatorAuditActionConstants::CLOSE,
     ))) {
       throw new ConduitException('ERR_BAD_ACTION');
     }
 
     $comment = id(new PhabricatorAuditComment())
       ->setAction($action)
       ->setContent($message);
 
     id(new PhabricatorAuditCommentEditor($commit))
       ->setActor($request->getUser())
       ->setNoEmail($request->getValue('silent'))
       ->addComment($comment);
 
     return true;
     // get the full uri of the comment?
     // i.e, PhabricatorEnv::getURI(rXX01ab23cd#comment-9)
   }
 
 }
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_diffquery_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_diffquery_Method.php
index 83852d8be7..20f052473c 100644
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_diffquery_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_diffquery_Method.php
@@ -1,235 +1,232 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_diffusion_diffquery_Method
   extends ConduitAPI_diffusion_abstractquery_Method {
 
   private $effectiveCommit;
 
   public function getMethodDescription() {
     return
       'Get diff information from a repository for a specific path at an '.
       '(optional) commit.';
   }
 
   public function defineReturnType() {
     return 'array';
   }
 
   protected function defineCustomParamTypes() {
     return array(
       'path' => 'required string',
       'commit' => 'optional string',
     );
   }
 
   protected function getResult(ConduitAPIRequest $request) {
     $result = parent::getResult($request);
 
     return array(
       'changes' => mpull($result, 'toDictionary'),
       'effectiveCommit' => $this->getEffectiveCommit($request),
     );
   }
 
   protected function getGitResult(ConduitAPIRequest $request) {
     return $this->getGitOrMercurialResult($request);
   }
 
   protected function getMercurialResult(ConduitAPIRequest $request) {
     return $this->getGitOrMercurialResult($request);
   }
 
   /**
    * NOTE: We have to work particularly hard for SVN as compared to other VCS.
    * That's okay but means this shares little code with the other VCS.
    */
   protected function getSVNResult(ConduitAPIRequest $request) {
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
 
     $effective_commit = $this->getEffectiveCommit($request);
     if (!$effective_commit) {
       return $this->getEmptyResult();
     }
 
     $drequest = clone $drequest;
     $drequest->updateSymbolicCommit($effective_commit);
 
     $path_change_query = DiffusionPathChangeQuery::newFromDiffusionRequest(
       $drequest);
     $path_changes = $path_change_query->loadChanges();
 
     $path = null;
     foreach ($path_changes as $change) {
       if ($change->getPath() == $drequest->getPath()) {
         $path = $change;
       }
     }
 
     if (!$path) {
       return $this->getEmptyResult();
     }
 
     $change_type = $path->getChangeType();
     switch ($change_type) {
       case DifferentialChangeType::TYPE_MULTICOPY:
       case DifferentialChangeType::TYPE_DELETE:
         if ($path->getTargetPath()) {
           $old = array(
             $path->getTargetPath(),
             $path->getTargetCommitIdentifier());
         } else {
           $old = array($path->getPath(), $path->getCommitIdentifier() - 1);
         }
         $old_name = $path->getPath();
         $new_name = '';
         $new = null;
         break;
       case DifferentialChangeType::TYPE_ADD:
         $old = null;
         $new = array($path->getPath(), $path->getCommitIdentifier());
         $old_name = '';
         $new_name = $path->getPath();
         break;
       case DifferentialChangeType::TYPE_MOVE_HERE:
       case DifferentialChangeType::TYPE_COPY_HERE:
         $old = array(
           $path->getTargetPath(),
           $path->getTargetCommitIdentifier());
         $new = array($path->getPath(), $path->getCommitIdentifier());
         $old_name = $path->getTargetPath();
         $new_name = $path->getPath();
         break;
       case DifferentialChangeType::TYPE_MOVE_AWAY:
         $old = array(
           $path->getPath(),
           $path->getCommitIdentifier() - 1);
         $old_name = $path->getPath();
         $new_name = null;
         $new = null;
         break;
       default:
         $old = array($path->getPath(), $path->getCommitIdentifier() - 1);
         $new = array($path->getPath(), $path->getCommitIdentifier());
         $old_name = $path->getPath();
         $new_name = $path->getPath();
         break;
     }
 
     $futures = array(
       'old' => $this->buildSVNContentFuture($old),
       'new' => $this->buildSVNContentFuture($new),
     );
     $futures = array_filter($futures);
 
     foreach (Futures($futures) as $key => $future) {
       $stdout = '';
       try {
         list($stdout) = $future->resolvex();
       } catch (CommandException $e) {
         if ($path->getFileType() != DifferentialChangeType::FILE_DIRECTORY) {
           throw $e;
         }
       }
       $futures[$key] = $stdout;
     }
 
     $old_data = idx($futures, 'old', '');
     $new_data = idx($futures, 'new', '');
 
     $engine = new PhabricatorDifferenceEngine();
     $engine->setOldName($old_name);
     $engine->setNewName($new_name);
     $raw_diff = $engine->generateRawDiffFromFileContent($old_data, $new_data);
 
     $arcanist_changes = DiffusionPathChange::convertToArcanistChanges(
       $path_changes);
 
     $parser = $this->getDefaultParser();
     $parser->setChanges($arcanist_changes);
     $parser->forcePath($path->getPath());
     $changes = $parser->parseDiff($raw_diff);
 
     $change = $changes[$path->getPath()];
 
     return array($change);
   }
 
   private function getEffectiveCommit(ConduitAPIRequest $request) {
     if ($this->effectiveCommit === null) {
       $drequest = $this->getDiffusionRequest();
 
       $path = $drequest->getPath();
       $result = DiffusionQuery::callConduitWithDiffusionRequest(
         $request->getUser(),
         $drequest,
         'diffusion.lastmodifiedquery',
         array(
           'paths' => array($path => $drequest->getStableCommit()),
         ));
 
       $this->effectiveCommit = idx($result, $path);
     }
 
     return $this->effectiveCommit;
   }
 
   private function buildSVNContentFuture($spec) {
     if (!$spec) {
       return null;
     }
 
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
 
     list($ref, $rev) = $spec;
     return $repository->getRemoteCommandFuture(
       'cat %s',
       $repository->getSubversionPathURI($ref, $rev));
   }
 
   private function getGitOrMercurialResult(ConduitAPIRequest $request) {
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
 
     $effective_commit = $this->getEffectiveCommit($request);
     if (!$effective_commit) {
       return $this->getEmptyResult(1);
     }
 
     $raw_query = DiffusionRawDiffQuery::newFromDiffusionRequest($drequest)
       ->setAnchorCommit($effective_commit);
 
     $raw_diff = $raw_query->loadRawDiff();
     if (!$raw_diff) {
       return $this->getEmptyResult(2);
     }
 
     $parser = $this->getDefaultParser();
     $changes = $parser->parseDiff($raw_diff);
 
     return $changes;
   }
 
   private function getDefaultParser() {
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
 
     $parser = new ArcanistDiffParser();
     $try_encoding = $repository->getDetail('encoding');
     if ($try_encoding) {
       $parser->setTryEncoding($try_encoding);
     }
     $parser->setDetectBinaryFiles(true);
 
     return $parser;
   }
 
   private function getEmptyResult() {
     return array();
   }
 
 }
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_existsquery_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_existsquery_Method.php
index 8fda475ed6..761a75237a 100644
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_existsquery_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_existsquery_Method.php
@@ -1,55 +1,53 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_diffusion_existsquery_Method
   extends ConduitAPI_diffusion_abstractquery_Method {
 
   public function getMethodDescription() {
     return 'Determine if code exists in a version control system.';
   }
 
   public function defineReturnType() {
     return 'bool';
   }
 
   protected function defineCustomParamTypes() {
     return array(
       'commit' => 'required string'
     );
   }
 
   protected function getGitResult(ConduitAPIRequest $request) {
     $repository = $this->getDiffusionRequest()->getRepository();
     $commit = $request->getValue('commit');
     list($err, $merge_base) = $repository->execLocalCommand(
       'cat-file -t %s',
       $commit);
     return !$err;
   }
 
   protected function getSVNResult(ConduitAPIRequest $request) {
     $repository = $this->getDiffusionRequest()->getRepository();
     $commit = $request->getValue('commit');
     list($info) = $repository->execxRemoteCommand(
       'info %s',
       $repository->getRemoteURI());
     $exists = false;
     $matches = null;
     if (preg_match('/^Revision: (\d+)$/m', $info, $matches)) {
       $base_revision = $matches[1];
       $exists = $base_revision >= $commit;
     }
     return $exists;
   }
 
   protected function getMercurialResult(ConduitAPIRequest $request) {
     $repository = $this->getDiffusionRequest()->getRepository();
     $commit = $request->getValue('commit');
     list($err, $stdout) = $repository->execLocalCommand(
       'id --rev %s',
       $commit);
     return  !$err;
   }
+
 }
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_filecontentquery_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_filecontentquery_Method.php
index f1d84eb73a..6bce4b15cf 100644
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_filecontentquery_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_filecontentquery_Method.php
@@ -1,45 +1,43 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_diffusion_filecontentquery_Method
   extends ConduitAPI_diffusion_abstractquery_Method {
 
   public function getMethodDescription() {
     return 'Retrieve file content from a repository.';
   }
 
   public function defineReturnType() {
     return 'array';
   }
 
   protected function defineCustomParamTypes() {
     return array(
       'path' => 'required string',
       'commit' => 'required string',
       'needsBlame' => 'optional bool',
     );
   }
 
   protected function getResult(ConduitAPIRequest $request) {
     $drequest = $this->getDiffusionRequest();
     $needs_blame = $request->getValue('needsBlame');
     $file_query = DiffusionFileContentQuery::newFromDiffusionRequest(
       $drequest);
     $file_query
       ->setViewer($request->getUser())
       ->setNeedsBlame($needs_blame);
     $file_content = $file_query->loadFileContent();
     if ($needs_blame) {
       list($text_list, $rev_list, $blame_dict) = $file_query->getBlameData();
     } else {
       $text_list = $rev_list = $blame_dict = array();
     }
     $file_content
       ->setBlameDict($blame_dict)
       ->setRevList($rev_list)
       ->setTextList($text_list);
     return $file_content->toDictionary();
   }
+
 }
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_findsymbols_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_findsymbols_Method.php
index 51462659af..c9556f6f5b 100644
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_findsymbols_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_findsymbols_Method.php
@@ -1,84 +1,81 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_diffusion_findsymbols_Method
   extends ConduitAPI_diffusion_Method {
 
   public function getMethodDescription() {
     return 'Retrieve Diffusion symbol information.';
   }
 
   public function defineParamTypes() {
     return array(
       'name'        => 'optional string',
       'namePrefix'  => 'optional string',
       'context'     => 'optional string',
       'language'    => 'optional string',
       'type'        => 'optional string',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty list<dict>';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $name = $request->getValue('name');
     $name_prefix = $request->getValue('namePrefix');
     $context = $request->getValue('context');
     $language = $request->getValue('language');
     $type = $request->getValue('type');
 
     $query = new DiffusionSymbolQuery();
     if ($name !== null) {
       $query->setName($name);
     }
     if ($name_prefix !== null) {
       $query->setNamePrefix($name_prefix);
     }
     if ($context !== null) {
       $query->setContext($context);
     }
     if ($language !== null) {
       $query->setLanguage($language);
     }
     if ($type !== null) {
       $query->setType($type);
     }
 
     $query->needPaths(true);
     $query->needArcanistProjects(true);
     $query->needRepositories(true);
 
     $results = $query->execute();
 
 
     $response = array();
     foreach ($results as $result) {
       $uri = $result->getURI();
       if ($uri) {
         $uri = PhabricatorEnv::getProductionURI($uri);
       }
 
       $response[] = array(
         'name'        => $result->getSymbolName(),
         'context'     => $result->getSymbolContext(),
         'type'        => $result->getSymbolType(),
         'language'    => $result->getSymbolLanguage(),
         'path'        => $result->getPath(),
         'line'        => $result->getLineNumber(),
         'uri'         => $uri,
       );
     }
 
     return $response;
   }
 
 }
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_getcommits_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_getcommits_Method.php
index 95c55b5a2c..46139ba66b 100644
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_getcommits_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_getcommits_Method.php
@@ -1,300 +1,295 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_diffusion_getcommits_Method
   extends ConduitAPI_diffusion_Method {
 
   public function getMethodDescription() {
     return pht('Retrieve Diffusion commit information.');
   }
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_DEPRECATED;
   }
 
   public function getMethodStatusDescription() {
     return pht('Obsoleted by diffusion.querycommits.');
   }
 
   public function defineParamTypes() {
     return array(
       'commits' => 'required list<string>',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty list<dict<string, wild>>';
   }
 
   public function defineErrorTypes() {
-    return array(
-    );
+    return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
-
     $results = array();
 
     $commits = $request->getValue('commits');
     $commits = array_fill_keys($commits, array());
     foreach ($commits as $name => $info) {
       $matches = null;
       if (!preg_match('/^r([A-Z]+)([0-9a-f]+)\z/', $name, $matches)) {
         $results[$name] = array(
           'error' => 'ERR-UNPARSEABLE',
         );
         unset($commits[$name]);
         continue;
       }
       $commits[$name] = array(
         'callsign'          => $matches[1],
         'commitIdentifier'  => $matches[2],
       );
     }
 
     if (!$commits) {
       return $results;
     }
 
     $callsigns = ipull($commits, 'callsign');
     $callsigns = array_unique($callsigns);
     $repos = id(new PhabricatorRepositoryQuery())
       ->setViewer($request->getUser())
       ->withCallsigns($callsigns)
       ->execute();
     $repos = mpull($repos, null, 'getCallsign');
 
     foreach ($commits as $name => $info) {
       $repo = idx($repos, $info['callsign']);
       if (!$repo) {
         $results[$name] = $info + array(
           'error' => 'ERR-UNKNOWN-REPOSITORY',
         );
         unset($commits[$name]);
         continue;
       }
       $commits[$name] += array(
         'repositoryPHID' => $repo->getPHID(),
         'repositoryID' => $repo->getID(),
       );
     }
 
     if (!$commits) {
       return $results;
     }
 
     // Execute a complicated query to figure out the primary commit information
     // for each referenced commit.
     $cdata = $this->queryCommitInformation($commits, $repos);
 
     // We've built the queries so that each row also has the identifier we used
     // to select it, which might be a git prefix rather than a full identifier.
     $ref_map = ipull($cdata, 'commitIdentifier', 'commitRef');
 
     $cobjs = id(new PhabricatorRepositoryCommit())->loadAllFromArray($cdata);
     $cobjs = mgroup($cobjs, 'getRepositoryID', 'getCommitIdentifier');
     foreach ($commits as $name => $commit) {
 
       // Expand short git names into full identifiers. For SVN this map is just
       // the identity.
       $full_identifier = idx($ref_map, $commit['commitIdentifier']);
 
       $repo_id = $commit['repositoryID'];
       unset($commits[$name]['repositoryID']);
 
       if (empty($full_identifier) ||
           empty($cobjs[$commit['repositoryID']][$full_identifier])) {
         $results[$name] = $commit + array(
           'error' => 'ERR-UNKNOWN-COMMIT',
         );
         unset($commits[$name]);
         continue;
       }
 
       $cobj_arr = $cobjs[$commit['repositoryID']][$full_identifier];
       $cobj = head($cobj_arr);
 
       $commits[$name] += array(
         'epoch'             => $cobj->getEpoch(),
         'commitPHID'        => $cobj->getPHID(),
         'commitID'          => $cobj->getID(),
       );
 
       // Upgrade git short references into full commit identifiers.
       $identifier = $cobj->getCommitIdentifier();
       $commits[$name]['commitIdentifier'] = $identifier;
 
       $callsign = $commits[$name]['callsign'];
       $uri = "/r{$callsign}{$identifier}";
       $commits[$name]['uri'] = PhabricatorEnv::getProductionURI($uri);
     }
 
     if (!$commits) {
       return $results;
     }
 
     $commits = $this->addRepositoryCommitDataInformation($commits);
     $commits = $this->addDifferentialInformation($commits);
     $commits = $this->addManiphestInformation($commits);
 
     foreach ($commits as $name => $commit) {
       $results[$name] = $commit;
     }
 
     return $results;
   }
 
   /**
    * Retrieve primary commit information for all referenced commits.
    */
   private function queryCommitInformation(array $commits, array $repos) {
     assert_instances_of($repos, 'PhabricatorRepository');
     $conn_r = id(new PhabricatorRepositoryCommit())->establishConnection('r');
     $repos = mpull($repos, null, 'getID');
 
     $groups = array();
     foreach ($commits as $name => $commit) {
       $groups[$commit['repositoryID']][] = $commit['commitIdentifier'];
     }
 
     // NOTE: MySQL goes crazy and does a massive table scan if we build a more
     // sensible version of this query. Make sure the query plan is OK if you
     // attempt to reduce the craziness here. METANOTE: The addition of prefix
     // selection for Git further complicates matters.
     $query = array();
     $commit_table = id(new PhabricatorRepositoryCommit())->getTableName();
 
     foreach ($groups as $repository_id => $identifiers) {
       $vcs = $repos[$repository_id]->getVersionControlSystem();
       $is_git = ($vcs == PhabricatorRepositoryType::REPOSITORY_TYPE_GIT);
       if ($is_git) {
         foreach ($identifiers as $identifier) {
           if (strlen($identifier) < 7) {
             // Don't bother with silly stuff like 'rX2', which will select
             // 1/16th of all commits. Note that with length 7 we'll still get
             // collisions in repositories at the tens-of-thousands-of-commits
             // scale.
             continue;
           }
           $query[] = qsprintf(
             $conn_r,
             'SELECT %T.*, %s commitRef
               FROM %T WHERE repositoryID = %d
               AND commitIdentifier LIKE %>',
             $commit_table,
             $identifier,
             $commit_table,
             $repository_id,
             $identifier);
         }
       } else {
         $query[] = qsprintf(
           $conn_r,
           'SELECT %T.*, commitIdentifier commitRef
             FROM %T WHERE repositoryID = %d
             AND commitIdentifier IN (%Ls)',
           $commit_table,
           $commit_table,
           $repository_id,
           $identifiers);
       }
     }
 
     return queryfx_all(
       $conn_r,
       '%Q',
       implode(' UNION ALL ', $query));
   }
 
   /**
    * Enhance the commit list with RepositoryCommitData information.
    */
   private function addRepositoryCommitDataInformation(array $commits) {
     $commit_ids = ipull($commits, 'commitID');
 
     $data = id(new PhabricatorRepositoryCommitData())->loadAllWhere(
       'commitID in (%Ld)',
       $commit_ids);
     $data = mpull($data, null, 'getCommitID');
 
     foreach ($commits as $name => $commit) {
       if (isset($data[$commit['commitID']])) {
         $dobj = $data[$commit['commitID']];
         $commits[$name] += array(
           'commitMessage' => $dobj->getCommitMessage(),
           'commitDetails' => $dobj->getCommitDetails(),
         );
       }
 
       // Remove this information so we don't expose it via the API since
       // external services shouldn't be storing internal Commit IDs.
       unset($commits[$name]['commitID']);
     }
 
     return $commits;
   }
 
   /**
    * Enhance the commit list with Differential information.
    */
   private function addDifferentialInformation(array $commits) {
     $commit_phids = ipull($commits, 'commitPHID');
 
     // TODO: (T603) This should be policy checked, either by moving to
     // DifferentialRevisionQuery or by doing a followup query to make sure
     // the matched objects are visible.
 
     $rev_conn_r = id(new DifferentialRevision())->establishConnection('r');
     $revs = queryfx_all(
       $rev_conn_r,
       'SELECT r.id id, r.phid phid, c.commitPHID commitPHID FROM %T r JOIN %T c
         ON r.id = c.revisionID
         WHERE c.commitPHID in (%Ls)',
       id(new DifferentialRevision())->getTableName(),
       DifferentialRevision::TABLE_COMMIT,
       $commit_phids);
 
     $revs = ipull($revs, null, 'commitPHID');
     foreach ($commits as $name => $commit) {
       if (isset($revs[$commit['commitPHID']])) {
         $rev = $revs[$commit['commitPHID']];
         $commits[$name] += array(
           'differentialRevisionID'    => 'D'.$rev['id'],
           'differentialRevisionPHID'  => $rev['phid'],
         );
       }
     }
 
     return $commits;
   }
 
   /**
    * Enhances the commits list with Maniphest information.
    */
   private function addManiphestInformation(array $commits) {
     $task_type = PhabricatorEdgeConfig::TYPE_COMMIT_HAS_TASK;
 
     $commit_phids = ipull($commits, 'commitPHID');
 
     $edge_query = id(new PhabricatorEdgeQuery())
       ->withSourcePHIDs($commit_phids)
       ->withEdgeTypes(array($task_type));
 
     $edges = $edge_query->execute();
 
     foreach ($commits as $name => $commit) {
       $task_phids = $edge_query->getDestinationPHIDs(
         array($commit['commitPHID']),
         array($task_type));
 
       $commits[$name] += array(
         'taskPHIDs' => $task_phids,
       );
     }
 
     return $commits;
   }
 
 }
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_getlintmessages_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_getlintmessages_Method.php
index 1e11ef114b..0321bfe9e2 100644
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_getlintmessages_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_getlintmessages_Method.php
@@ -1,73 +1,69 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_diffusion_getlintmessages_Method
   extends ConduitAPI_diffusion_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
     return 'Get lint messages for existing code.';
   }
 
   public function defineParamTypes() {
     return array(
       'arcanistProject' => 'required string',
       'branch'          => 'optional string',
       'commit'          => 'optional string',
       'files'           => 'required list<string>',
     );
   }
 
   public function defineReturnType() {
     return 'list<dict>';
   }
 
   public function defineErrorTypes() {
-    return array(
-    );
+    return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $project = id(new PhabricatorRepositoryArcanistProject())->loadOneWhere(
       'name = %s',
       $request->getValue('arcanistProject'));
     if (!$project || !$project->getRepositoryID()) {
       return array();
     }
 
     $branch_name = $request->getValue('branch');
     if ($branch_name == '') {
       $repository = id(new PhabricatorRepositoryQuery())
         ->setViewer($request->getUser())
         ->withIDs(array($project->getRepositoryID()))
         ->executeOne();
       $branch_name = $repository->getDefaultArcanistBranch();
     }
 
     $branch = id(new PhabricatorRepositoryBranch())->loadOneWhere(
       'repositoryID = %d AND name = %s',
       $project->getRepositoryID(),
       $branch_name);
     if (!$branch || !$branch->getLintCommit()) {
       return array();
     }
 
     $lint_messages = queryfx_all(
       $branch->establishConnection('r'),
       'SELECT path, line, code FROM %T WHERE branchID = %d AND path IN (%Ls)',
       PhabricatorRepository::TABLE_LINTMESSAGE,
       $branch->getID(),
       $request->getValue('files'));
 
     // TODO: Compare commit identifiers of individual files like in
     // DiffusionBrowseFileController::loadLintMessages().
 
     return $lint_messages;
   }
 
 }
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_getrecentcommitsbypath_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_getrecentcommitsbypath_Method.php
index ca4467e018..6f91f1fae4 100644
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_getrecentcommitsbypath_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_getrecentcommitsbypath_Method.php
@@ -1,67 +1,65 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_diffusion_getrecentcommitsbypath_Method
   extends ConduitAPI_diffusion_Method {
 
   const DEFAULT_LIMIT = 10;
 
   public function getMethodDescription() {
     return 'Get commit identifiers for recent commits affecting a given path.';
   }
 
   public function defineParamTypes() {
     return array(
       'callsign' => 'required string',
       'path' => 'required string',
       'branch' => 'optional string',
       'limit' => 'optional int',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty list<string>';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $drequest = DiffusionRequest::newFromDictionary(
       array(
         'user' => $request->getUser(),
         'callsign' => $request->getValue('callsign'),
         'path' => $request->getValue('path'),
         'branch' => $request->getValue('branch'),
       ));
 
     $limit = nonempty(
       $request->getValue('limit'),
       self::DEFAULT_LIMIT);
 
     $history_result = DiffusionQuery::callConduitWithDiffusionRequest(
       $request->getUser(),
       $drequest,
       'diffusion.historyquery',
       array(
         'commit' => $drequest->getCommit(),
         'path' => $drequest->getPath(),
         'offset' => 0,
         'limit' => $limit,
         'needDirectChanges' => true,
         'needChildChanges' => true));
     $history = DiffusionPathChange::newFromConduit(
       $history_result['pathChanges']);
 
     $raw_commit_identifiers = mpull($history, 'getCommitIdentifier');
     $result = array();
     foreach ($raw_commit_identifiers as $id) {
       $result[] = 'r'.$request->getValue('callsign').$id;
     }
     return $result;
   }
+
 }
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_historyquery_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_historyquery_Method.php
index fbcc750ef5..7683dd0d77 100644
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_historyquery_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_historyquery_Method.php
@@ -1,267 +1,265 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_diffusion_historyquery_Method
-extends ConduitAPI_diffusion_abstractquery_Method {
+  extends ConduitAPI_diffusion_abstractquery_Method {
 
   private $parents = array();
 
   public function getMethodDescription() {
     return 'Returns history information for a repository at a specific '.
       'commit and path.';
   }
 
   public function defineReturnType() {
     return 'array';
   }
 
   protected function defineCustomParamTypes() {
     return array(
       'commit' => 'required string',
       'path' => 'required string',
       'offset' => 'required int',
       'limit' => 'required int',
       'needDirectChanges' => 'optional bool',
       'needChildChanges' => 'optional bool',
     );
   }
 
   protected function getResult(ConduitAPIRequest $request) {
     $path_changes = parent::getResult($request);
 
     return array(
       'pathChanges' => mpull($path_changes, 'toDictionary'),
-      'parents' => $this->parents);
+      'parents' => $this->parents,
+    );
   }
 
   protected function getGitResult(ConduitAPIRequest $request) {
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
     $commit_hash = $request->getValue('commit');
     $path = $request->getValue('path');
     $offset = $request->getValue('offset');
     $limit = $request->getValue('limit');
 
     list($stdout) = $repository->execxLocalCommand(
       'log '.
         '--skip=%d '.
         '-n %d '.
         '--pretty=format:%s '.
         '%s -- %C',
       $offset,
       $limit,
       '%H:%P',
       $commit_hash,
       // Git omits merge commits if the path is provided, even if it is empty.
       (strlen($path) ? csprintf('%s', $path) : ''));
 
     $lines = explode("\n", trim($stdout));
     $lines = array_filter($lines);
     if (!$lines) {
       return array();
     }
 
     $hash_list = array();
     $parent_map = array();
     foreach ($lines as $line) {
       list($hash, $parents) = explode(':', $line);
       $hash_list[] = $hash;
       $parent_map[$hash] = preg_split('/\s+/', $parents);
     }
 
     $this->parents = $parent_map;
 
     return DiffusionQuery::loadHistoryForCommitIdentifiers(
       $hash_list,
       $drequest);
   }
 
   protected function getMercurialResult(ConduitAPIRequest $request) {
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
     $commit_hash = $request->getValue('commit');
     $path = $request->getValue('path');
     $offset = $request->getValue('offset');
     $limit = $request->getValue('limit');
 
     $path = DiffusionPathIDQuery::normalizePath($path);
     $path = ltrim($path, '/');
 
     // NOTE: Older versions of Mercurial give different results for these
     // commands (see T1268):
     //
     //   $ hg log -- ''
     //   $ hg log
     //
     // All versions of Mercurial give different results for these commands
     // (merge commits are excluded with the "." version):
     //
     //   $ hg log -- .
     //   $ hg log
     //
     // If we don't have a path component in the query, omit it from the command
     // entirely to avoid these inconsistencies.
 
     // NOTE: When viewing the history of a file, we don't use "-b", because
     // Mercurial stops history at the branchpoint but we're interested in all
     // ancestors. When viewing history of a branch, we do use "-b", and thus
     // stop history (this is more consistent with the Mercurial worldview of
     // branches).
 
     if (strlen($path)) {
       $path_arg = csprintf('-- %s', $path);
       $branch_arg = '';
     } else {
       $path_arg = '';
       // NOTE: --branch used to be called --only-branch; use -b for
       // compatibility.
       $branch_arg = csprintf('-b %s', $drequest->getBranch());
     }
 
     list($stdout) = $repository->execxLocalCommand(
       'log --debug --template %s --limit %d %C --rev %s %C',
       '{node};{parents}\\n',
       ($offset + $limit), // No '--skip' in Mercurial.
       $branch_arg,
       hgsprintf('reverse(ancestors(%s))', $commit_hash),
       $path_arg);
 
     $stdout = PhabricatorRepository::filterMercurialDebugOutput($stdout);
     $lines = explode("\n", trim($stdout));
     $lines = array_slice($lines, $offset);
 
     $hash_list = array();
     $parent_map = array();
 
     $last = null;
     foreach (array_reverse($lines) as $line) {
       list($hash, $parents) = explode(';', $line);
       $parents = trim($parents);
       if (!$parents) {
         if ($last === null) {
           $parent_map[$hash] = array('...');
         } else {
           $parent_map[$hash] = array($last);
         }
       } else {
         $parents = preg_split('/\s+/', $parents);
         foreach ($parents as $parent) {
           list($plocal, $phash) = explode(':', $parent);
           if (!preg_match('/^0+$/', $phash)) {
             $parent_map[$hash][] = $phash;
           }
         }
         // This may happen for the zeroth commit in repository, both hashes
         // are "000000000...".
         if (empty($parent_map[$hash])) {
           $parent_map[$hash] = array('...');
         }
       }
 
       // The rendering code expects the first commit to be "mainline", like
       // Git. Flip the order so it does the right thing.
       $parent_map[$hash] = array_reverse($parent_map[$hash]);
 
       $hash_list[] = $hash;
       $last = $hash;
     }
 
     $hash_list = array_reverse($hash_list);
     $this->parents = $parent_map;
 
     return DiffusionQuery::loadHistoryForCommitIdentifiers(
       $hash_list,
       $drequest);
   }
 
   protected function getSVNResult(ConduitAPIRequest $request) {
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
     $commit = $request->getValue('commit');
     $path = $request->getValue('path');
     $offset = $request->getValue('offset');
     $limit = $request->getValue('limit');
     $need_direct_changes = $request->getValue('needDirectChanges');
     $need_child_changes = $request->getValue('needChildChanges');
 
     $conn_r = $repository->establishConnection('r');
 
     $paths = queryfx_all(
       $conn_r,
       'SELECT id, path FROM %T WHERE pathHash IN (%Ls)',
       PhabricatorRepository::TABLE_PATH,
       array(md5('/'.trim($path, '/'))));
     $paths = ipull($paths, 'id', 'path');
     $path_id = idx($paths, '/'.trim($path, '/'));
 
     if (!$path_id) {
       return array();
     }
 
     $filter_query = '';
     if ($need_direct_changes) {
       if ($need_child_changes) {
         $type = DifferentialChangeType::TYPE_CHILD;
         $filter_query = 'AND (isDirect = 1 OR changeType = '.$type.')';
       } else {
         $filter_query = 'AND (isDirect = 1)';
       }
     }
 
     $history_data = queryfx_all(
       $conn_r,
       'SELECT * FROM %T WHERE repositoryID = %d AND pathID = %d
         AND commitSequence <= %d
         %Q
         ORDER BY commitSequence DESC
         LIMIT %d, %d',
       PhabricatorRepository::TABLE_PATHCHANGE,
       $repository->getID(),
       $path_id,
       $commit ? $commit : 0x7FFFFFFF,
       $filter_query,
       $offset,
       $limit);
 
     $commits = array();
     $commit_data = array();
 
     $commit_ids = ipull($history_data, 'commitID');
     if ($commit_ids) {
       $commits = id(new PhabricatorRepositoryCommit())->loadAllWhere(
         'id IN (%Ld)',
         $commit_ids);
       if ($commits) {
         $commit_data = id(new PhabricatorRepositoryCommitData())->loadAllWhere(
           'commitID in (%Ld)',
           $commit_ids);
         $commit_data = mpull($commit_data, null, 'getCommitID');
       }
     }
 
     $history = array();
     foreach ($history_data as $row) {
       $item = new DiffusionPathChange();
 
       $commit = idx($commits, $row['commitID']);
       if ($commit) {
         $item->setCommit($commit);
         $item->setCommitIdentifier($commit->getCommitIdentifier());
         $data = idx($commit_data, $commit->getID());
         if ($data) {
           $item->setCommitData($data);
         }
       }
 
       $item->setChangeType($row['changeType']);
       $item->setFileType($row['fileType']);
 
       $history[] = $item;
     }
 
     return $history;
   }
 
 }
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_mergedcommitsquery_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_mergedcommitsquery_Method.php
index 92af65a3d8..df208a2d05 100644
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_mergedcommitsquery_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_mergedcommitsquery_Method.php
@@ -1,107 +1,104 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_diffusion_mergedcommitsquery_Method
-extends ConduitAPI_diffusion_abstractquery_Method {
+  extends ConduitAPI_diffusion_abstractquery_Method {
 
   public function getMethodDescription() {
     return
       'Merged commit information for a specific commit in a repository.';
   }
 
   public function defineReturnType() {
     return 'array';
   }
 
   protected function defineCustomParamTypes() {
     return array(
       'commit' => 'required string',
       'limit' => 'optional int',
     );
   }
 
   private function getLimit(ConduitAPIRequest $request) {
     return $request->getValue('limit', PHP_INT_MAX);
   }
 
   protected function getGitResult(ConduitAPIRequest $request) {
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
     $commit = $request->getValue('commit');
     $limit = $this->getLimit($request);
 
     list($parents) = $repository->execxLocalCommand(
       'log -n 1 --format=%s %s',
       '%P',
       $commit);
 
     $parents = preg_split('/\s+/', trim($parents));
     if (count($parents) < 2) {
       // This is not a merge commit, so it doesn't merge anything.
       return array();
     }
 
     // Get all of the commits which are not reachable from the first parent.
     // These are the commits this change merges.
 
     $first_parent = head($parents);
     list($logs) = $repository->execxLocalCommand(
       'log -n %d --format=%s %s %s --',
       // NOTE: "+ 1" accounts for the merge commit itself.
       $limit + 1,
       '%H',
       $commit,
       '^'.$first_parent);
 
     $hashes = explode("\n", trim($logs));
 
     // Remove the merge commit.
     $hashes = array_diff($hashes, array($commit));
 
     return DiffusionQuery::loadHistoryForCommitIdentifiers(
       $hashes,
       $drequest);
    }
 
   protected function getMercurialResult(ConduitAPIRequest $request) {
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
     $commit = $request->getValue('commit');
     $limit = $this->getLimit($request);
 
     list($parents) = $repository->execxLocalCommand(
       'parents --template=%s --rev %s',
       '{node}\\n',
       $commit);
     $parents = explode("\n", trim($parents));
 
     if (count($parents) < 2) {
       // Not a merge commit.
       return array();
     }
 
     // NOTE: In Git, the first parent is the "mainline". In Mercurial, the
     // second parent is the "mainline" (the way 'git merge' and 'hg merge'
     // work is also reversed).
 
     $last_parent = last($parents);
     list($logs) = $repository->execxLocalCommand(
       'log --template=%s --follow --limit %d --rev %s:0 --prune %s --',
       '{node}\\n',
       $limit + 1,
       $commit,
       $last_parent);
 
     $hashes = explode("\n", trim($logs));
 
     // Remove the merge commit.
     $hashes = array_diff($hashes, array($commit));
 
     return DiffusionQuery::loadHistoryForCommitIdentifiers(
       $hashes,
       $drequest);
   }
 
 }
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_rawdiffquery_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_rawdiffquery_Method.php
index ffced64cac..60249781d2 100644
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_rawdiffquery_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_rawdiffquery_Method.php
@@ -1,57 +1,54 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_diffusion_rawdiffquery_Method
   extends ConduitAPI_diffusion_abstractquery_Method {
 
   public function getMethodDescription() {
     return
       'Get raw diff information from a repository for a specific commit at an '.
       '(optional) path.';
   }
 
   public function defineReturnType() {
     return 'string';
   }
 
   protected function defineCustomParamTypes() {
     return array(
       'commit' => 'required string',
       'path' => 'optional string',
       'timeout' => 'optional int',
       'byteLimit' => 'optional int',
       'linesOfContext' => 'optional int',
       'againstCommit' => 'optional string',
     );
   }
 
   protected function getResult(ConduitAPIRequest $request) {
     $drequest = $this->getDiffusionRequest();
 
     $raw_query = DiffusionRawDiffQuery::newFromDiffusionRequest($drequest);
 
     $timeout = $request->getValue('timeout');
     if ($timeout !== null) {
       $raw_query->setTimeout($timeout);
     }
 
     $lines_of_context = $request->getValue('linesOfContext');
     if ($lines_of_context !== null) {
       $raw_query->setLinesOfContext($lines_of_context);
     }
 
     $against_commit = $request->getValue('againstCommit');
     if ($against_commit !== null) {
       $raw_query->setAgainstCommit($against_commit);
     }
 
     $byte_limit = $request->getValue('byteLimit');
     if ($byte_limit !== null) {
       $raw_query->setByteLimit($byte_limit);
     }
 
     return $raw_query->loadRawDiff();
   }
 }
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_refsquery_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_refsquery_Method.php
index 5c9ca2c7c5..fe396ebc5e 100644
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_refsquery_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_refsquery_Method.php
@@ -1,57 +1,54 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_diffusion_refsquery_Method
   extends ConduitAPI_diffusion_abstractquery_Method {
 
   public function getMethodDescription() {
     return
       'Query a git repository for ref information at a specific commit.';
   }
 
   public function defineReturnType() {
     return 'array';
   }
 
   protected function defineCustomParamTypes() {
     return array(
       'commit' => 'required string',
     );
   }
 
   protected function getGitResult(ConduitAPIRequest $request) {
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
     $commit = $request->getValue('commit');
 
     list($stdout) = $repository->execxLocalCommand(
       'log --format=%s -n 1 %s --',
       '%d',
       $commit);
 
     // %d, gives a weird output format
     // similar to (remote/one, remote/two, remote/three)
     $refs = trim($stdout, "() \n");
     if (!$refs) {
       return array();
     }
     $refs = explode(',', $refs);
     $refs = array_map('trim', $refs);
 
     $ref_links = array();
     foreach ($refs as $ref) {
       $ref_links[] = array(
         'ref' => $ref,
         'href' => $drequest->generateURI(
           array(
             'action'  => 'browse',
             'branch'  => $ref,
           )));
     }
 
     return $ref_links;
   }
 
 }
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_searchquery_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_searchquery_Method.php
index cfbe60a1bb..1c2f31d481 100644
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_searchquery_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_searchquery_Method.php
@@ -1,115 +1,113 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_diffusion_searchquery_Method
   extends ConduitAPI_diffusion_abstractquery_Method {
 
   public function getMethodDescription() {
     return 'Search (grep) a repository at a specific path and commit.';
   }
 
   public function defineReturnType() {
     return 'array';
   }
 
   protected function defineCustomParamTypes() {
     return array(
       'path' => 'required string',
       'commit' => 'optional string',
       'grep' => 'required string',
       'limit' => 'optional int',
       'offset' => 'optional int',
     );
   }
 
   protected function defineCustomErrorTypes() {
     return array(
       'ERR-GREP-COMMAND' => 'Grep command failed.');
   }
 
   protected function getResult(ConduitAPIRequest $request) {
     try {
       $results = parent::getResult($request);
     } catch (CommandException $ex) {
       throw id(new ConduitException('ERR-GREP-COMMAND'))
         ->setErrorDescription($ex->getStderr());
     }
 
     $offset = $request->getValue('offset');
     $results = array_slice($results, $offset);
 
     return $results;
   }
 
   protected function getGitResult(ConduitAPIRequest $request) {
     $drequest = $this->getDiffusionRequest();
     $path = $drequest->getPath();
     $grep = $request->getValue('grep');
     $repository = $drequest->getRepository();
     $limit = $request->getValue('limit');
     $offset = $request->getValue('offset');
 
     $results = array();
     $future = $repository->getLocalCommandFuture(
       // NOTE: --perl-regexp is available only with libpcre compiled in.
       'grep --extended-regexp --null -n --no-color -e %s %s -- %s',
       $grep,
       $drequest->getStableCommit(),
       $path);
 
     $binary_pattern = '/Binary file [^:]*:(.+) matches/';
     $lines = new LinesOfALargeExecFuture($future);
     foreach ($lines as $line) {
       $result = null;
       if (preg_match('/[^:]*:(.+)\0(.+)\0(.*)/', $line, $result)) {
         $results[] = array_slice($result, 1);
       } else if (preg_match($binary_pattern, $line, $result)) {
         list(, $path) = $result;
         $results[] = array($path, null, pht('Binary file'));
       } else {
         $results[] = array(null, null, $line);
       }
       if (count($results) >= $offset + $limit) {
         break;
       }
     }
     unset($lines);
 
     return $results;
   }
 
   protected function getMercurialResult(ConduitAPIRequest $request) {
     $drequest = $this->getDiffusionRequest();
     $path = $drequest->getPath();
     $grep = $request->getValue('grep');
     $repository = $drequest->getRepository();
     $limit = $request->getValue('limit');
     $offset = $request->getValue('offset');
 
     $results = array();
     $future = $repository->getLocalCommandFuture(
       'grep --rev %s --print0 --line-number %s %s',
       hgsprintf('ancestors(%s)', $drequest->getStableCommit()),
       $grep,
       $path);
 
     $lines = id(new LinesOfALargeExecFuture($future))->setDelimiter("\0");
     $parts = array();
     foreach ($lines as $line) {
       $parts[] = $line;
       if (count($parts) == 4) {
         list($path, $char_offset, $line, $string) = $parts;
         $results[] = array($path, $line, $string);
         if (count($results) >= $offset + $limit) {
           break;
         }
         $parts = array();
       }
     }
     unset($lines);
 
     return $results;
   }
+
 }
diff --git a/src/applications/diffusion/query/DiffusionSymbolQuery.php b/src/applications/diffusion/query/DiffusionSymbolQuery.php
index a9341d34fd..4aa987fe45 100644
--- a/src/applications/diffusion/query/DiffusionSymbolQuery.php
+++ b/src/applications/diffusion/query/DiffusionSymbolQuery.php
@@ -1,287 +1,284 @@
 <?php
 
 /**
  * Query symbol information (class and function names and location), returning
  * a list of matching @{class:PhabricatorRepositorySymbol} objects and possibly
  * attached data.
  *
  * @task config   Configuring the Query
  * @task exec     Executing the Query
  * @task internal Internals
- *
- * @group diffusion
  */
 final class DiffusionSymbolQuery extends PhabricatorOffsetPagedQuery {
 
   private $context;
   private $namePrefix;
   private $name;
 
   private $projectIDs;
   private $language;
   private $type;
 
   private $needPaths;
   private $needArcanistProject;
   private $needRepositories;
 
 
 /* -(  Configuring the Query  )---------------------------------------------- */
 
 
   /**
    * @task config
    */
   public function setContext($context) {
     $this->context = $context;
     return $this;
   }
 
 
   /**
    * @task config
    */
   public function setName($name) {
     $this->name = $name;
     return $this;
   }
 
 
   /**
    * @task config
    */
   public function setNamePrefix($name_prefix) {
     $this->namePrefix = $name_prefix;
     return $this;
   }
 
 
   /**
    * @task config
    */
   public function setProjectIDs(array $project_ids) {
     $this->projectIDs = $project_ids;
     return $this;
   }
 
 
   /**
    * @task config
    */
   public function setLanguage($language) {
     $this->language = $language;
     return $this;
   }
 
 
   /**
    * @task config
    */
   public function setType($type) {
     $this->type = $type;
     return $this;
   }
 
 
   /**
    * @task config
    */
   public function needPaths($need_paths) {
     $this->needPaths = $need_paths;
     return $this;
   }
 
 
   /**
    * @task config
    */
   public function needArcanistProjects($need_arcanist_projects) {
     $this->needArcanistProjects = $need_arcanist_projects;
     return $this;
   }
 
 
   /**
    * @task config
    */
   public function needRepositories($need_repositories) {
     $this->needRepositories = $need_repositories;
     return $this;
   }
 
 
 /* -(  Executing the Query  )------------------------------------------------ */
 
 
   /**
    * @task exec
    */
   public function execute() {
     if ($this->name && $this->namePrefix) {
       throw new Exception(
         'You can not set both a name and a name prefix!');
     } else if (!$this->name && !$this->namePrefix) {
       throw new Exception(
         'You must set a name or a name prefix!');
     }
 
     $symbol = new PhabricatorRepositorySymbol();
     $conn_r = $symbol->establishConnection('r');
 
     $data = queryfx_all(
       $conn_r,
       'SELECT * FROM %T %Q %Q %Q',
       $symbol->getTableName(),
       $this->buildWhereClause($conn_r),
       $this->buildOrderClause($conn_r),
       $this->buildLimitClause($conn_r));
 
     $symbols = $symbol->loadAllFromArray($data);
 
     if ($symbols) {
       if ($this->needPaths) {
         $this->loadPaths($symbols);
       }
       if ($this->needArcanistProjects || $this->needRepositories) {
         $this->loadArcanistProjects($symbols);
       }
       if ($this->needRepositories) {
         $this->loadRepositories($symbols);
       }
 
     }
 
     return $symbols;
   }
 
 
 /* -(  Internals  )---------------------------------------------------------- */
 
 
   /**
    * @task internal
    */
   private function buildOrderClause($conn_r) {
     return qsprintf(
       $conn_r,
       'ORDER BY symbolName ASC');
   }
 
 
   /**
    * @task internal
    */
   private function buildWhereClause($conn_r) {
     $where = array();
 
     if (isset($this->context)) {
       $where[] = qsprintf(
         $conn_r,
         'symbolContext = %s',
         $this->context);
     }
 
     if ($this->name) {
       $where[] = qsprintf(
         $conn_r,
         'symbolName = %s',
         $this->name);
     }
 
     if ($this->namePrefix) {
       $where[] = qsprintf(
         $conn_r,
         'symbolName LIKE %>',
         $this->namePrefix);
     }
 
     if ($this->projectIDs) {
       $where[] = qsprintf(
         $conn_r,
         'arcanistProjectID IN (%Ld)',
         $this->projectIDs);
     }
 
     if ($this->language) {
       $where[] = qsprintf(
         $conn_r,
         'symbolLanguage = %s',
         $this->language);
     }
 
     if ($this->type) {
       $where[] = qsprintf(
         $conn_r,
         'symbolType = %s',
         $this->type);
     }
 
     return $this->formatWhereClause($where);
   }
 
 
   /**
    * @task internal
    */
   private function loadPaths(array $symbols) {
     assert_instances_of($symbols, 'PhabricatorRepositorySymbol');
     $path_map = queryfx_all(
       id(new PhabricatorRepository())->establishConnection('r'),
       'SELECT * FROM %T WHERE id IN (%Ld)',
       PhabricatorRepository::TABLE_PATH,
       mpull($symbols, 'getPathID'));
     $path_map = ipull($path_map, 'path', 'id');
     foreach ($symbols as $symbol) {
       $symbol->attachPath(idx($path_map, $symbol->getPathID()));
     }
   }
 
 
   /**
    * @task internal
    */
   private function loadArcanistProjects(array $symbols) {
     assert_instances_of($symbols, 'PhabricatorRepositorySymbol');
     $projects = id(new PhabricatorRepositoryArcanistProject())->loadAllWhere(
       'id IN (%Ld)',
       mpull($symbols, 'getArcanistProjectID'));
     foreach ($symbols as $symbol) {
       $project = idx($projects, $symbol->getArcanistProjectID());
       $symbol->attachArcanistProject($project);
     }
   }
 
 
   /**
    * @task internal
    */
   private function loadRepositories(array $symbols) {
     assert_instances_of($symbols, 'PhabricatorRepositorySymbol');
 
     $projects = mpull($symbols, 'getArcanistProject');
     $projects = array_filter($projects);
 
     $repo_ids = mpull($projects, 'getRepositoryID');
     $repo_ids = array_filter($repo_ids);
 
     if ($repo_ids) {
       // TODO: (T603) Provide a viewer here.
       $repos = id(new PhabricatorRepository())->loadAllWhere(
         'id IN (%Ld)',
         $repo_ids);
     } else {
       $repos = array();
     }
 
     foreach ($symbols as $symbol) {
       $proj = $symbol->getArcanistProject();
       if ($proj) {
         $symbol->attachRepository(idx($repos, $proj->getRepositoryID()));
       } else {
         $symbol->attachRepository(null);
       }
     }
   }
 
-
 }
diff --git a/src/applications/drydock/blueprint/DrydockPreallocatedHostBlueprintImplementation.php b/src/applications/drydock/blueprint/DrydockPreallocatedHostBlueprintImplementation.php
index 86a2b15d9d..0c877e842c 100644
--- a/src/applications/drydock/blueprint/DrydockPreallocatedHostBlueprintImplementation.php
+++ b/src/applications/drydock/blueprint/DrydockPreallocatedHostBlueprintImplementation.php
@@ -1,123 +1,123 @@
 <?php
 
 final class DrydockPreallocatedHostBlueprintImplementation
   extends DrydockBlueprintImplementation {
 
   public function isEnabled() {
     return true;
   }
 
   public function getBlueprintName() {
     return pht('Preallocated Remote Hosts');
   }
 
   public function getDescription() {
     return pht('Allows Drydock to run on specific remote hosts you configure.');
   }
 
   public function canAllocateMoreResources(array $pool) {
     return false;
   }
 
   protected function executeAllocateResource(DrydockLease $lease) {
     throw new Exception("Preallocated hosts can't be dynamically allocated.");
   }
 
   protected function canAllocateLease(
     DrydockResource $resource,
     DrydockLease $lease) {
     return
       $lease->getAttribute('platform') === $resource->getAttribute('platform');
   }
 
   protected function shouldAllocateLease(
     DrydockResource $resource,
     DrydockLease $lease,
     array $other_leases) {
     return true;
   }
 
   protected function executeAcquireLease(
     DrydockResource $resource,
     DrydockLease $lease) {
 
     // Because preallocated resources are manually created, we should verify
     // we have all the information we need.
     PhutilTypeSpec::checkMap(
       $resource->getAttributesForTypeSpec(
         array('platform', 'host', 'port', 'credential', 'path')),
       array(
         'platform' => 'string',
         'host' => 'string',
         'port' => 'string', // Value is a string from the command line
         'credential' => 'string',
         'path' => 'string',
       ));
     $v_platform = $resource->getAttribute('platform');
     $v_path = $resource->getAttribute('path');
 
     // Similar to DrydockLocalHostBlueprint, we create a folder
     // on the remote host that the lease can use.
 
     $lease_id = $lease->getID();
 
     // Can't use DIRECTORY_SEPERATOR here because that is relevant to
     // the platform we're currently running on, not the platform we are
     // remoting to.
     $separator = '/';
     if ($v_platform === 'windows') {
       $separator = '\\';
     }
 
     // Clean up the directory path a little.
     $base_path = rtrim($v_path, '/');
     $base_path = rtrim($base_path, '\\');
     $full_path = $base_path.$separator.$lease_id;
 
     $cmd = $lease->getInterface('command');
 
     if ($v_platform !== 'windows') {
       $cmd->execx('mkdir %s', $full_path);
     } else {
-      // Windows is terrible.  The mkdir command doesn't even support putting
-      // the path in quotes.  IN QUOTES.  ARGUHRGHUGHHGG!!  Do some terribly
+      // Windows is terrible. The mkdir command doesn't even support putting
+      // the path in quotes. IN QUOTES. ARGUHRGHUGHHGG!! Do some terribly
       // inaccurate sanity checking since we can't safely escape the path.
       if (preg_match('/^[A-Z]\\:\\\\[a-zA-Z0-9\\\\\\ ]/', $full_path) === 0) {
         throw new Exception(
           'Unsafe path detected for Windows platform: "'.$full_path.'".');
       }
       $cmd->execx('mkdir %C', $full_path);
     }
 
     $lease->setAttribute('path', $full_path);
   }
 
   public function getType() {
     return 'host';
   }
 
   public function getInterface(
     DrydockResource $resource,
     DrydockLease $lease,
     $type) {
 
     switch ($type) {
       case 'command':
         return id(new DrydockSSHCommandInterface())
           ->setConfiguration(array(
             'host' => $resource->getAttribute('host'),
             'port' => $resource->getAttribute('port'),
             'credential' => $resource->getAttribute('credential'),
             'platform' => $resource->getAttribute('platform')));
       case 'filesystem':
         return id(new DrydockSFTPFilesystemInterface())
           ->setConfiguration(array(
             'host' => $resource->getAttribute('host'),
             'port' => $resource->getAttribute('port'),
             'credential' => $resource->getAttribute('credential')));
     }
 
     throw new Exception("No interface of type '{$type}'.");
   }
 
 }
diff --git a/src/applications/feed/conduit/ConduitAPI_feed_Method.php b/src/applications/feed/conduit/ConduitAPI_feed_Method.php
index 0f4c86263f..a0afd09715 100644
--- a/src/applications/feed/conduit/ConduitAPI_feed_Method.php
+++ b/src/applications/feed/conduit/ConduitAPI_feed_Method.php
@@ -1,13 +1,10 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class ConduitAPI_feed_Method extends ConduitAPIMethod {
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
       'PhabricatorApplicationFeed');
   }
 
 }
diff --git a/src/applications/feed/conduit/ConduitAPI_feed_publish_Method.php b/src/applications/feed/conduit/ConduitAPI_feed_publish_Method.php
index c7e853b8ab..78dd0ad480 100644
--- a/src/applications/feed/conduit/ConduitAPI_feed_publish_Method.php
+++ b/src/applications/feed/conduit/ConduitAPI_feed_publish_Method.php
@@ -1,54 +1,50 @@
 <?php
 
-/**
- * @group conduit
- */
-final class ConduitAPI_feed_publish_Method
-  extends ConduitAPI_feed_Method {
+final class ConduitAPI_feed_publish_Method extends ConduitAPI_feed_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
     return 'Publish a story to the feed.';
   }
 
   public function defineParamTypes() {
     return array(
       'type' => 'required string',
       'data' => 'required dict',
       'time' => 'optional int',
     );
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   public function defineReturnType() {
     return 'nonempty phid';
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $type = $request->getValue('type');
     $data = $request->getValue('data');
     $time = $request->getValue('time');
 
     $author_phid = $request->getUser()->getPHID();
     $phids = array($author_phid);
 
     $publisher = new PhabricatorFeedStoryPublisher();
     $publisher->setStoryType($type);
     $publisher->setStoryData($data);
     $publisher->setStoryTime($time);
     $publisher->setRelatedPHIDs($phids);
     $publisher->setStoryAuthorPHID($author_phid);
 
     $data = $publisher->publish();
 
     return $data->getPHID();
   }
 
 }
diff --git a/src/applications/feed/conduit/ConduitAPI_feed_query_Method.php b/src/applications/feed/conduit/ConduitAPI_feed_query_Method.php
index 973e656f03..5ab7210928 100644
--- a/src/applications/feed/conduit/ConduitAPI_feed_query_Method.php
+++ b/src/applications/feed/conduit/ConduitAPI_feed_query_Method.php
@@ -1,146 +1,141 @@
 <?php
 
-/**
- * @group conduit
- */
-final class ConduitAPI_feed_query_Method
-  extends ConduitAPI_feed_Method {
+final class ConduitAPI_feed_query_Method extends ConduitAPI_feed_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
     return 'Query the feed for stories';
   }
 
   private function getDefaultLimit() {
     return 100;
   }
 
   public function defineParamTypes() {
     return array(
       'filterPHIDs' => 'optional list <phid>',
       'limit' => 'optional int (default '.$this->getDefaultLimit().')',
       'after' => 'optional int',
       'before' => 'optional int',
       'view' => 'optional string (data, html, html-summary, text)',
     );
   }
 
   private function getSupportedViewTypes() {
     return array(
       'html' => 'Full HTML presentation of story',
       'data' => 'Dictionary with various data of the story',
       'html-summary' => 'Story contains only the title of the story',
       'text' => 'Simple one-line plain text representation of story',
     );
   }
 
   public function defineErrorTypes() {
 
     $view_types = array_keys($this->getSupportedViewTypes());
     $view_types = implode(', ', $view_types);
 
     return array(
       'ERR-UNKNOWN-TYPE' =>
-        'Unsupported view type, possibles are: '.$view_types
+        'Unsupported view type, possibles are: '.$view_types,
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   protected function execute(ConduitAPIRequest $request) {
-
     $results = array();
     $user = $request->getUser();
 
     $view_type = $request->getValue('view');
     if (!$view_type) {
       $view_type = 'data';
     }
 
     $limit = $request->getValue('limit');
     if (!$limit) {
       $limit = $this->getDefaultLimit();
     }
     $filter_phids = $request->getValue('filterPHIDs');
     if (!$filter_phids) {
       $filter_phids = array();
     }
 
     $query = id(new PhabricatorFeedQuery())
       ->setLimit($limit)
       ->setFilterPHIDs($filter_phids)
       ->setViewer($user);
 
     $after = $request->getValue('after');
     if (strlen($after)) {
       $query->setAfterID($after);
     }
 
     $before = $request->getValue('before');
     if (strlen($before)) {
       $query->setBeforeID($before);
     }
 
     $stories = $query->execute();
 
     if ($stories) {
       foreach ($stories as $story) {
 
         $story_data = $story->getStoryData();
 
         $data = null;
 
         try {
           $view = $story->renderView();
         } catch (Exception $ex) {
           // When stories fail to render, just fail that story.
           phlog($ex);
           continue;
         }
 
         $view->setEpoch($story->getEpoch());
         $view->setUser($user);
 
         switch ($view_type) {
           case 'html':
             $data = $view->render();
           break;
           case 'html-summary':
             $data = $view->render();
           break;
           case 'data':
             $data = array(
               'class' => $story_data->getStoryType(),
               'epoch' => $story_data->getEpoch(),
               'authorPHID' => $story_data->getAuthorPHID(),
               'chronologicalKey' => $story_data->getChronologicalKey(),
               'data' => $story_data->getStoryData(),
             );
           break;
           case 'text':
             $data = array(
               'class' => $story_data->getStoryType(),
               'epoch' => $story_data->getEpoch(),
               'authorPHID' => $story_data->getAuthorPHID(),
               'chronologicalKey' => $story_data->getChronologicalKey(),
               'objectPHID' => $story->getPrimaryObjectPHID(),
               'text' => $story->renderText()
             );
           break;
           default:
             throw new ConduitException('ERR-UNKNOWN-TYPE');
         }
 
         $results[$story_data->getPHID()] = $data;
       }
     }
 
     return $results;
   }
 
 }
diff --git a/src/applications/files/conduit/ConduitAPI_file_Method.php b/src/applications/files/conduit/ConduitAPI_file_Method.php
index 0c003dd730..45f525221d 100644
--- a/src/applications/files/conduit/ConduitAPI_file_Method.php
+++ b/src/applications/files/conduit/ConduitAPI_file_Method.php
@@ -1,13 +1,10 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class ConduitAPI_file_Method extends ConduitAPIMethod {
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
       'PhabricatorApplicationFiles');
   }
 
 }
diff --git a/src/applications/files/conduit/ConduitAPI_file_download_Method.php b/src/applications/files/conduit/ConduitAPI_file_download_Method.php
index e28f21e6e6..32bb71188f 100644
--- a/src/applications/files/conduit/ConduitAPI_file_download_Method.php
+++ b/src/applications/files/conduit/ConduitAPI_file_download_Method.php
@@ -1,43 +1,39 @@
 <?php
 
-/**
- * @group conduit
- */
-final class ConduitAPI_file_download_Method
-  extends ConduitAPI_file_Method {
+final class ConduitAPI_file_download_Method extends ConduitAPI_file_Method {
 
   public function getMethodDescription() {
     return 'Download a file from the server.';
   }
 
   public function defineParamTypes() {
     return array(
       'phid' => 'required phid',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty base64-bytes';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-BAD-PHID' => 'No such file exists.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $phid = $request->getValue('phid');
 
     $file = id(new PhabricatorFileQuery())
       ->setViewer($request->getUser())
       ->withPHIDs(array($phid))
       ->executeOne();
     if (!$file) {
       throw new ConduitException('ERR-BAD-PHID');
     }
 
     return base64_encode($file->loadFileData());
   }
 
 }
diff --git a/src/applications/files/conduit/ConduitAPI_file_info_Method.php b/src/applications/files/conduit/ConduitAPI_file_info_Method.php
index e316712123..795c29f6da 100644
--- a/src/applications/files/conduit/ConduitAPI_file_info_Method.php
+++ b/src/applications/files/conduit/ConduitAPI_file_info_Method.php
@@ -1,63 +1,60 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_file_info_Method extends ConduitAPI_file_Method {
 
   public function getMethodDescription() {
     return 'Get information about a file.';
   }
 
   public function defineParamTypes() {
     return array(
       'phid' => 'optional phid',
       'id'   => 'optional id',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-NOT-FOUND'     => 'No such file exists.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $phid = $request->getValue('phid');
     $id   = $request->getValue('id');
 
     $query = id(new PhabricatorFileQuery())
       ->setViewer($request->getUser());
     if ($id) {
       $query->withIDs(array($id));
     } else {
       $query->withPHIDs(array($phid));
     }
 
     $file = $query->executeOne();
 
     if (!$file) {
       throw new ConduitException('ERR-NOT-FOUND');
     }
 
     $uri = $file->getBestURI();
 
     return array(
       'id'            => $file->getID(),
       'phid'          => $file->getPHID(),
       'objectName'    => 'F'.$file->getID(),
       'name'          => $file->getName(),
       'mimeType'      => $file->getMimeType(),
       'byteSize'      => $file->getByteSize(),
       'authorPHID'    => $file->getAuthorPHID(),
       'dateCreated'   => $file->getDateCreated(),
       'dateModified'  => $file->getDateModified(),
       'uri'           => PhabricatorEnv::getProductionURI($uri),
     );
   }
 
 }
diff --git a/src/applications/files/conduit/ConduitAPI_file_upload_Method.php b/src/applications/files/conduit/ConduitAPI_file_upload_Method.php
index f172b89d62..5da5b9521d 100644
--- a/src/applications/files/conduit/ConduitAPI_file_upload_Method.php
+++ b/src/applications/files/conduit/ConduitAPI_file_upload_Method.php
@@ -1,43 +1,40 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_file_upload_Method extends ConduitAPI_file_Method {
 
   public function getMethodDescription() {
     return 'Upload a file to the server.';
   }
 
   public function defineParamTypes() {
     return array(
       'data_base64' => 'required nonempty base64-bytes',
       'name' => 'optional string',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty guid';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $data = $request->getValue('data_base64');
     $name = $request->getValue('name');
     $data = base64_decode($data, $strict = true);
     $user = $request->getUser();
 
     $file = PhabricatorFile::newFromFileData(
       $data,
       array(
         'name' => $name,
         'authorPHID' => $user->getPHID(),
       ));
     return $file->getPHID();
   }
 
 }
diff --git a/src/applications/files/conduit/ConduitAPI_file_uploadhash_Method.php b/src/applications/files/conduit/ConduitAPI_file_uploadhash_Method.php
index dd724ce019..03c07592eb 100644
--- a/src/applications/files/conduit/ConduitAPI_file_uploadhash_Method.php
+++ b/src/applications/files/conduit/ConduitAPI_file_uploadhash_Method.php
@@ -1,45 +1,43 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_file_uploadhash_Method extends ConduitAPI_file_Method {
 
   public function getMethodDescription() {
     return 'Upload a file to the server using content hash.';
   }
 
   public function defineParamTypes() {
     return array(
       'hash' => 'required nonempty string',
       'name' => 'required nonempty string',
     );
   }
 
   public function defineReturnType() {
     return 'phid or null';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $hash = $request->getValue('hash');
     $name = $request->getValue('name');
     $user = $request->getUser();
 
     $file = PhabricatorFile::newFileFromContentHash(
       $hash,
       array(
         'name' => $name,
         'authorPHID' => $user->getPHID(),
       ));
 
     if ($file) {
       return $file->getPHID();
     }
     return $file;
   }
+
 }
diff --git a/src/applications/files/config/PhabricatorFilesConfigOptions.php b/src/applications/files/config/PhabricatorFilesConfigOptions.php
index 100b8f1b00..f7a3d78627 100644
--- a/src/applications/files/config/PhabricatorFilesConfigOptions.php
+++ b/src/applications/files/config/PhabricatorFilesConfigOptions.php
@@ -1,200 +1,196 @@
 <?php
 
-/**
- * @group file
- */
 final class PhabricatorFilesConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
     return pht('Files');
   }
 
   public function getDescription() {
     return pht('Configure files and file storage.');
   }
 
   public function getOptions() {
-
     $viewable_default = array(
       'image/jpeg'  => 'image/jpeg',
       'image/jpg'   => 'image/jpg',
       'image/png'   => 'image/png',
       'image/gif'   => 'image/gif',
       'text/plain'  => 'text/plain; charset=utf-8',
       'text/x-diff' => 'text/plain; charset=utf-8',
 
       // ".ico" favicon files, which have mime type diversity. See:
       // http://en.wikipedia.org/wiki/ICO_(file_format)#MIME_type
       'image/x-ico'               => 'image/x-icon',
       'image/x-icon'              => 'image/x-icon',
       'image/vnd.microsoft.icon'  => 'image/x-icon',
 
       'audio/x-wav'     => 'audio/x-wav',
       'application/ogg' => 'application/ogg',
       'audio/mpeg'      => 'audio/mpeg',
     );
 
     $image_default = array(
       'image/jpeg'                => true,
       'image/jpg'                 => true,
       'image/png'                 => true,
       'image/gif'                 => true,
       'image/x-ico'               => true,
       'image/x-icon'              => true,
       'image/vnd.microsoft.icon'  => true,
     );
 
     $audio_default = array(
       'audio/x-wav'     => true,
       'application/ogg' => true,
       'audio/mpeg'      => true,
     );
 
     // largely lifted from http://en.wikipedia.org/wiki/Internet_media_type
     $icon_default = array(
       // audio file icon
       'audio/basic' => 'docs_audio',
       'audio/L24' => 'docs_audio',
       'audio/mp4' => 'docs_audio',
       'audio/mpeg' => 'docs_audio',
       'audio/ogg' => 'docs_audio',
       'audio/vorbis' => 'docs_audio',
       'audio/vnd.rn-realaudio' => 'docs_audio',
       'audio/vnd.wave' => 'docs_audio',
       'audio/webm' => 'docs_audio',
       // movie file icon
       'video/mpeg' => 'docs_movie',
       'video/mp4' => 'docs_movie',
       'video/ogg' => 'docs_movie',
       'video/quicktime' => 'docs_movie',
       'video/webm' => 'docs_movie',
       'video/x-matroska' => 'docs_movie',
       'video/x-ms-wmv' => 'docs_movie',
       'video/x-flv' => 'docs_movie',
       // pdf file icon
       'application/pdf' => 'docs_pdf',
       // zip file icon
       'application/zip' => 'docs_zip',
       // msword icon
       'application/msword' => 'docs_doc',
     ) + array_fill_keys(array_keys($image_default), 'docs_image');
 
     return array(
       $this->newOption('files.viewable-mime-types', 'wild', $viewable_default)
         ->setSummary(
           pht('Configure which MIME types are viewable in the browser.'))
         ->setDescription(
           pht(
             'Configure which uploaded file types may be viewed directly '.
             'in the browser. Other file types will be downloaded instead '.
             'of displayed. This is mainly a usability consideration, since '.
             'browsers tend to freak out when viewing enormous binary files.'.
             "\n\n".
             'The keys in this map are vieweable MIME types; the values are '.
             'the MIME types they are delivered as when they are viewed in '.
             'the browser.')),
       $this->newOption('files.image-mime-types', 'set', $image_default)
         ->setSummary(pht('Configure which MIME types are images.'))
         ->setDescription(
           pht(
             'List of MIME types which can be used as the `src` for an '.
             '`<img />` tag.')),
       $this->newOption('files.audio-mime-types', 'set', $audio_default)
         ->setSummary(pht('Configure which MIME types are audio.'))
         ->setDescription(
           pht(
             'List of MIME types which can be used to render an '.
             '`<audio />` tag.')),
       $this->newOption('files.icon-mime-types', 'wild', $icon_default)
         ->setSummary(pht('Configure which MIME types map to which icons.'))
         ->setDescription(
           pht(
             'Map of MIME type to icon name. MIME types which can not be '.
             'found default to icon `doc_files`.')),
       $this->newOption('storage.mysql-engine.max-size', 'int', 1000000)
         ->setSummary(
           pht(
             'Configure the largest file which will be put into the MySQL '.
             'storage engine.')),
       $this->newOption('storage.local-disk.path', 'string', null)
         ->setLocked(true)
         ->setSummary(pht('Local storage disk path.'))
         ->setDescription(
           pht(
             "Phabricator provides a local disk storage engine, which just ".
             "writes files to some directory on local disk. The webserver ".
             "must have read/write permissions on this directory. This is ".
             "straightforward and suitable for most installs, but will not ".
             "scale past one web frontend unless the path is actually an NFS ".
             "mount, since you'll end up with some of the files written to ".
             "each web frontend and no way for them to share. To use the ".
             "local disk storage engine, specify the path to a directory ".
             "here. To disable it, specify null.")),
      $this->newOption('storage.s3.bucket', 'string', null)
         ->setSummary(pht('Amazon S3 bucket.'))
         ->setDescription(
           pht(
             "Set this to a valid Amazon S3 bucket to store files there. You ".
             "must also configure S3 access keys in the 'Amazon Web Services' ".
             "group.")),
      $this->newOption(
        'storage.engine-selector',
        'class',
        'PhabricatorDefaultFileStorageEngineSelector')
         ->setBaseClass('PhabricatorFileStorageEngineSelector')
         ->setSummary(pht('Storage engine selector.'))
         ->setDescription(
           pht(
             'Phabricator uses a storage engine selector to choose which '.
             'storage engine to use when writing file data. If you add new '.
             'storage engines or want to provide very custom rules (e.g., '.
             'write images to one storage engine and other files to a '.
             'different one), you can provide an alternate implementation '.
             'here. The default engine will use choose MySQL, Local Disk, and '.
             'S3, in that order, if they have valid configurations above and '.
             'a file fits within configured limits.')),
      $this->newOption('storage.upload-size-limit', 'string', null)
         ->setSummary(
           pht('Limit to users in interfaces which allow uploading.'))
         ->setDescription(
           pht(
             "Set the size of the largest file a user may upload. This is ".
             "used to render text like 'Maximum file size: 10MB' on ".
             "interfaces where users can upload files, and files larger than ".
             "this size will be rejected. \n\n".
             "NOTE: **Setting this to a large size is NOT sufficient to ".
             "allow users to upload large files. You must also configure a ".
             "number of other settings.** To configure file upload limits, ".
             "consult the article 'Configuring File Upload Limits' in the ".
             "documentation. Once you've configured some limit across all ".
             "levels of the server, you can set this limit to an appropriate ".
             "value and the UI will then reflect the actual configured ".
             "limit.\n\n".
             "Specify this limit in bytes, or using a 'K', 'M', or 'G' ".
             "suffix."))
         ->addExample('10M', pht('Allow Uploads 10MB or Smaller')),
      $this->newOption(
         'metamta.files.public-create-email',
         'string',
         null)
         ->setDescription(pht('Allow uploaded files via email.')),
      $this->newOption(
         'metamta.files.subject-prefix',
         'string',
         '[File]')
         ->setDescription(pht('Subject prefix for Files email.')),
      $this->newOption('files.enable-imagemagick', 'bool', false)
        ->setBoolOptions(
          array(
            pht('Enable'),
            pht('Disable')
          ))->setDescription(
              pht("This option will enable animated gif images".
                   "to be set as profile pictures. The 'convert' binary ".
                   "should be available to the webserver for this to work")),
 
     );
   }
 
 }
diff --git a/src/applications/files/controller/PhabricatorFileCommentController.php b/src/applications/files/controller/PhabricatorFileCommentController.php
index 1895f6c75d..16e6e3f3a9 100644
--- a/src/applications/files/controller/PhabricatorFileCommentController.php
+++ b/src/applications/files/controller/PhabricatorFileCommentController.php
@@ -1,73 +1,69 @@
 <?php
 
-/**
- * @group file
- */
-final class PhabricatorFileCommentController
-  extends PhabricatorFileController {
+final class PhabricatorFileCommentController extends PhabricatorFileController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = idx($data, 'id');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     if (!$request->isFormPost()) {
       return new Aphront400Response();
     }
 
     $file = id(new PhabricatorFileQuery())
       ->setViewer($user)
       ->withIDs(array($this->id))
       ->executeOne();
     if (!$file) {
       return new Aphront404Response();
     }
 
     $is_preview = $request->isPreviewRequest();
     $draft = PhabricatorDraft::buildFromRequest($request);
 
     $view_uri = $file->getInfoURI();
 
     $xactions = array();
     $xactions[] = id(new PhabricatorFileTransaction())
       ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
       ->attachComment(
         id(new PhabricatorFileTransactionComment())
           ->setContent($request->getStr('comment')));
 
     $editor = id(new PhabricatorFileEditor())
       ->setActor($user)
       ->setContinueOnNoEffect($request->isContinueRequest())
       ->setContentSourceFromRequest($request)
       ->setIsPreview($is_preview);
 
     try {
       $xactions = $editor->applyTransactions($file, $xactions);
     } catch (PhabricatorApplicationTransactionNoEffectException $ex) {
       return id(new PhabricatorApplicationTransactionNoEffectResponse())
         ->setCancelURI($view_uri)
         ->setException($ex);
     }
 
     if ($draft) {
       $draft->replaceOrDelete();
     }
 
     if ($request->isAjax() && $is_preview) {
       return id(new PhabricatorApplicationTransactionResponse())
         ->setViewer($user)
         ->setTransactions($xactions)
         ->setIsPreview($is_preview)
         ->setAnchorOffset($request->getStr('anchor'));
     } else {
       return id(new AphrontRedirectResponse())
         ->setURI($view_uri);
     }
   }
 
 }
diff --git a/src/applications/files/editor/PhabricatorFileEditor.php b/src/applications/files/editor/PhabricatorFileEditor.php
index 8d9c773cda..52411c9e5e 100644
--- a/src/applications/files/editor/PhabricatorFileEditor.php
+++ b/src/applications/files/editor/PhabricatorFileEditor.php
@@ -1,93 +1,90 @@
 <?php
 
-/**
- * @group file
- */
 final class PhabricatorFileEditor
   extends PhabricatorApplicationTransactionEditor {
 
   public function getTransactionTypes() {
     $types = parent::getTransactionTypes();
 
     $types[] = PhabricatorTransactions::TYPE_COMMENT;
 
     return $types;
   }
 
   protected function getCustomTransactionOldValue(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
   }
 
   protected function getCustomTransactionNewValue(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
   }
 
   protected function applyCustomInternalTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
   }
 
   protected function applyCustomExternalTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
   }
 
   protected function shouldSendMail(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return true;
   }
 
   protected function getMailSubjectPrefix() {
     return PhabricatorEnv::getEnvConfig('metamta.files.subject-prefix');
   }
 
   protected function getMailTo(PhabricatorLiskDAO $object) {
     return array(
       $object->getAuthorPHID(),
       $this->requireActor()->getPHID(),
     );
   }
 
   protected function buildReplyHandler(PhabricatorLiskDAO $object) {
     return id(new FileReplyHandler())
       ->setMailReceiver($object);
   }
 
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $id = $object->getID();
     $name = $object->getName();
 
     return id(new PhabricatorMetaMTAMail())
       ->setSubject("F{$id}: {$name}")
       ->addHeader('Thread-Topic', "F{$id}");
   }
 
   protected function buildMailBody(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $body = parent::buildMailBody($object, $xactions);
 
     $body->addTextSection(
       pht('FILE DETAIL'),
       PhabricatorEnv::getProductionURI($object->getInfoURI()));
 
     return $body;
   }
 
   protected function shouldPublishFeedStory(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return true;
   }
 
   protected function supportsSearch() {
     return false;
   }
 
 }
diff --git a/src/applications/files/engine/PhabricatorFileStorageEngine.php b/src/applications/files/engine/PhabricatorFileStorageEngine.php
index 393357c054..4bdf111ddc 100644
--- a/src/applications/files/engine/PhabricatorFileStorageEngine.php
+++ b/src/applications/files/engine/PhabricatorFileStorageEngine.php
@@ -1,94 +1,93 @@
 <?php
 
 /**
  * Defines a storage engine which can write file data somewhere (like a
  * database, local disk, Amazon S3, the A:\ drive, or a custom filer) and
  * retrieve it later.
  *
  * You can extend this class to provide new file storage backends.
  *
  * For more information, see @{article:File Storage Technical Documentation}.
  *
  * @task construct Constructing an Engine
  * @task meta Engine Metadata
  * @task file Managing File Data
- * @group filestorage
  */
 abstract class PhabricatorFileStorageEngine {
 
   /**
    * Construct a new storage engine.
    *
    * @task construct
    */
   final public function __construct() {
     // <empty>
   }
 
 
 /* -(  Engine Metadata  )---------------------------------------------------- */
 
 
   /**
    * Return a unique, nonempty string which identifies this storage engine.
    * This is used to look up the storage engine when files needs to be read or
    * deleted. For instance, if you store files by giving them to a duck for
    * safe keeping in his nest down by the pond, you might return 'duck' from
    * this method.
    *
    * @return string Unique string for this engine, max length 32.
    * @task meta
    */
   abstract public function getEngineIdentifier();
 
 
 /* -(  Managing File Data  )------------------------------------------------- */
 
 
   /**
    * Write file data to the backing storage and return a handle which can later
    * be used to read or delete it. For example, if the backing storage is local
    * disk, the handle could be the path to the file.
    *
    * The caller will provide a $params array, which may be empty or may have
    * some metadata keys (like "name" and "author") in it. You should be prepared
    * to handle writes which specify no metadata, but might want to optionally
    * use some keys in this array for debugging or logging purposes. This is
    * the same dictionary passed to @{method:PhabricatorFile::newFromFileData},
    * so you could conceivably do custom things with it.
    *
    * If you are unable to write for whatever reason (e.g., the disk is full),
    * throw an exception. If there are other satisfactory but less-preferred
    * storage engines available, they will be tried.
    *
    * @param  string The file data to write.
    * @param  array  File metadata (name, author), if available.
    * @return string Unique string which identifies the stored file, max length
    *                255.
    * @task file
    */
   abstract public function writeFile($data, array $params);
 
 
   /**
    * Read the contents of a file previously written by @{method:writeFile}.
    *
    * @param   string  The handle returned from @{method:writeFile} when the
    *                  file was written.
    * @return  string  File contents.
    * @task file
    */
   abstract public function readFile($handle);
 
 
   /**
    * Delete the data for a file previously written by @{method:writeFile}.
    *
    * @param   string  The handle returned from @{method:writeFile} when the
    *                  file was written.
    * @return  void
    * @task file
    */
   abstract public function deleteFile($handle);
 
 }
diff --git a/src/applications/files/engine/PhabricatorLocalDiskFileStorageEngine.php b/src/applications/files/engine/PhabricatorLocalDiskFileStorageEngine.php
index 3f6d7d0f88..25238299ce 100644
--- a/src/applications/files/engine/PhabricatorLocalDiskFileStorageEngine.php
+++ b/src/applications/files/engine/PhabricatorLocalDiskFileStorageEngine.php
@@ -1,124 +1,122 @@
 <?php
 
 /**
  * Local disk storage engine. Keeps files on local disk. This engine is easy
  * to set up, but it doesn't work if you have multiple web frontends!
  *
  * @task impl     Implementation
  * @task internal Internals
- * @group filestorage
  */
 final class PhabricatorLocalDiskFileStorageEngine
   extends PhabricatorFileStorageEngine {
 
 
 /* -(  Implementation  )----------------------------------------------------- */
 
 
   /**
    * This engine identifies as "local-disk".
    * @task impl
    */
   public function getEngineIdentifier() {
     return 'local-disk';
   }
 
 
   /**
    * Write the file data to local disk. Returns the relative path as the
    * file data handle.
    * @task impl
    */
   public function writeFile($data, array $params) {
-
     $root = $this->getLocalDiskFileStorageRoot();
 
     // Generate a random, unique file path like "ab/29/1f918a9ac39201ff". We
     // put a couple of subdirectories up front to avoid a situation where we
     // have one directory with a zillion files in it, since this is generally
     // bad news.
     do {
       $name = md5(mt_rand());
       $name = preg_replace('/^(..)(..)(.*)$/', '\\1/\\2/\\3', $name);
       if (!Filesystem::pathExists($root.'/'.$name)) {
         break;
       }
     } while (true);
 
     $parent = $root.'/'.dirname($name);
     if (!Filesystem::pathExists($parent)) {
       execx('mkdir -p %s', $parent);
     }
 
     AphrontWriteGuard::willWrite();
     Filesystem::writeFile($root.'/'.$name, $data);
 
     return $name;
   }
 
 
   /**
    * Read the file data off local disk.
    * @task impl
    */
   public function readFile($handle) {
     $path = $this->getLocalDiskFileStorageFullPath($handle);
     return Filesystem::readFile($path);
   }
 
 
   /**
    * Deletes the file from local disk, if it exists.
    * @task impl
    */
   public function deleteFile($handle) {
     $path = $this->getLocalDiskFileStorageFullPath($handle);
     if (Filesystem::pathExists($path)) {
       AphrontWriteGuard::willWrite();
       Filesystem::remove($path);
     }
   }
 
 
 /* -(  Internals  )---------------------------------------------------------- */
 
 
   /**
    * Get the configured local disk path for file storage.
    *
    * @return string Absolute path to somewhere that files can be stored.
    * @task internal
    */
   private function getLocalDiskFileStorageRoot() {
     $root = PhabricatorEnv::getEnvConfig('storage.local-disk.path');
 
     if (!$root || $root == '/' || $root[0] != '/') {
       throw new PhabricatorFileStorageConfigurationException(
         "Malformed local disk storage root. You must provide an absolute ".
         "path, and can not use '/' as the root.");
     }
 
     return rtrim($root, '/');
   }
 
 
   /**
    * Convert a handle into an absolute local disk path.
    *
    * @param string File data handle.
    * @return string Absolute path to the corresponding file.
    * @task internal
    */
   private function getLocalDiskFileStorageFullPath($handle) {
     // Make sure there's no funny business going on here. Users normally have
     // no ability to affect the content of handles, but double-check that
     // we're only accessing local storage just in case.
     if (!preg_match('@^[a-f0-9]{2}/[a-f0-9]{2}/[a-f0-9]{28}\z@', $handle)) {
       throw new Exception(
         "Local disk filesystem handle '{$handle}' is malformed!");
     }
     $root = $this->getLocalDiskFileStorageRoot();
     return $root.'/'.$handle;
   }
 
 }
diff --git a/src/applications/files/engine/PhabricatorMySQLFileStorageEngine.php b/src/applications/files/engine/PhabricatorMySQLFileStorageEngine.php
index 77a46a9703..cd86170f66 100644
--- a/src/applications/files/engine/PhabricatorMySQLFileStorageEngine.php
+++ b/src/applications/files/engine/PhabricatorMySQLFileStorageEngine.php
@@ -1,81 +1,80 @@
 <?php
 
 /**
  * MySQL blob storage engine. This engine is the easiest to set up but doesn't
  * scale very well.
  *
  * It uses the @{class:PhabricatorFileStorageBlob} to actually access the
  * underlying database table.
  *
  * @task impl     Implementation
  * @task internal Internals
- * @group filestorage
  */
 final class PhabricatorMySQLFileStorageEngine
   extends PhabricatorFileStorageEngine {
 
 /* -(  Implementation  )----------------------------------------------------- */
 
 
   /**
    * For historical reasons, this engine identifies as "blob".
    *
    * @task impl
    */
   public function getEngineIdentifier() {
     return 'blob';
   }
 
 
   /**
    * Write file data into the big blob store table in MySQL. Returns the row
    * ID as the file data handle.
    *
    * @task impl
    */
   public function writeFile($data, array $params) {
     $blob = new PhabricatorFileStorageBlob();
     $blob->setData($data);
     $blob->save();
 
     return $blob->getID();
   }
 
 
   /**
    * Load a stored blob from MySQL.
    * @task impl
    */
   public function readFile($handle) {
     return $this->loadFromMySQLFileStorage($handle)->getData();
   }
 
 
   /**
    * Delete a blob from MySQL.
    * @task impl
    */
   public function deleteFile($handle) {
     $this->loadFromMySQLFileStorage($handle)->delete();
   }
 
 
 /* -(  Internals  )---------------------------------------------------------- */
 
 
   /**
    * Load the Lisk object that stores the file data for a handle.
    *
    * @param string  File data handle.
    * @return PhabricatorFileStorageBlob Data DAO.
    * @task internal
    */
   private function loadFromMySQLFileStorage($handle) {
     $blob = id(new PhabricatorFileStorageBlob())->load($handle);
     if (!$blob) {
       throw new Exception("Unable to load MySQL blob file '{$handle}'!");
     }
     return $blob;
   }
 
 }
diff --git a/src/applications/files/engine/PhabricatorTestStorageEngine.php b/src/applications/files/engine/PhabricatorTestStorageEngine.php
index 0dc2c8757b..04398016dd 100644
--- a/src/applications/files/engine/PhabricatorTestStorageEngine.php
+++ b/src/applications/files/engine/PhabricatorTestStorageEngine.php
@@ -1,36 +1,34 @@
 <?php
 
 /**
  * Test storage engine. Does not actually store files. Used for unit tests.
- *
- * @group filestorage
  */
 final class PhabricatorTestStorageEngine
   extends PhabricatorFileStorageEngine {
 
   private static $storage = array();
   private static $nextHandle = 1;
 
   public function getEngineIdentifier() {
     return 'unit-test';
   }
 
   public function writeFile($data, array $params) {
     AphrontWriteGuard::willWrite();
     self::$storage[self::$nextHandle] = $data;
     return (string)self::$nextHandle++;
   }
 
   public function readFile($handle) {
     if (isset(self::$storage[$handle])) {
       return self::$storage[$handle];
     }
     throw new Exception("No such file with handle '{$handle}'!");
   }
 
   public function deleteFile($handle) {
     AphrontWriteGuard::willWrite();
     unset(self::$storage[$handle]);
   }
 
 }
diff --git a/src/applications/files/engineselector/PhabricatorDefaultFileStorageEngineSelector.php b/src/applications/files/engineselector/PhabricatorDefaultFileStorageEngineSelector.php
index a83261fa60..7d30a5f640 100644
--- a/src/applications/files/engineselector/PhabricatorDefaultFileStorageEngineSelector.php
+++ b/src/applications/files/engineselector/PhabricatorDefaultFileStorageEngineSelector.php
@@ -1,54 +1,52 @@
 <?php
 
 /**
  * Default storage engine selector. See
  * @{class:PhabricatorFileStorageEngineSelector} and @{article:File Storage
  * Technical Documentation} for more information.
- *
- * @group filestorage
  */
 final class PhabricatorDefaultFileStorageEngineSelector
   extends PhabricatorFileStorageEngineSelector {
 
   /**
    * Select viable default storage engines according to configuration. We'll
    * select the MySQL and Local Disk storage engines if they are configured
    * to allow a given file.
    */
   public function selectStorageEngines($data, array $params) {
     $length = strlen($data);
 
     $mysql_key = 'storage.mysql-engine.max-size';
     $mysql_limit = PhabricatorEnv::getEnvConfig($mysql_key);
 
     $engines = array();
     if ($mysql_limit && $length <= $mysql_limit) {
       $engines[] = new PhabricatorMySQLFileStorageEngine();
     }
 
     $local_key = 'storage.local-disk.path';
     $local_path = PhabricatorEnv::getEnvConfig($local_key);
     if ($local_path) {
       $engines[] = new PhabricatorLocalDiskFileStorageEngine();
     }
 
     $s3_key = 'storage.s3.bucket';
     if (PhabricatorEnv::getEnvConfig($s3_key)) {
       $engines[] = new PhabricatorS3FileStorageEngine();
     }
 
     if ($mysql_limit && empty($engines)) {
       // If we return no engines, an exception will be thrown but it will be
       // a little vague ("No valid storage engines"). Since this is a default
       // case, throw a more specific exception.
       throw new Exception(
         'This file exceeds the configured MySQL storage engine filesize '.
         'limit, but no other storage engines are configured. Increase the '.
         'MySQL storage engine limit or configure a storage engine suitable '.
         'for larger files.');
     }
 
     return $engines;
   }
 
 }
diff --git a/src/applications/files/engineselector/PhabricatorFileStorageEngineSelector.php b/src/applications/files/engineselector/PhabricatorFileStorageEngineSelector.php
index 7c42f4647a..3785b724f1 100644
--- a/src/applications/files/engineselector/PhabricatorFileStorageEngineSelector.php
+++ b/src/applications/files/engineselector/PhabricatorFileStorageEngineSelector.php
@@ -1,47 +1,46 @@
 <?php
 
 /**
  * Chooses appropriate storage engine(s) for files. When Phabricator needs
  * to write a blob of file data, it uses the configured selector to get a list
  * of suitable @{class:PhabricatorFileStorageEngine}s. For more information,
  * see @{article:File Storage Technical Documentation}.
  *
- * @group filestorage
  * @task  select  Selecting Storage Engines
  */
 abstract class PhabricatorFileStorageEngineSelector {
 
   final public function __construct() {
     // <empty>
   }
 
 
 /* -(  Selecting Storage Engines  )------------------------------------------ */
 
 
   /**
    * Select valid storage engines for a file. This method will be called by
    * Phabricator when it needs to store a file permanently. It must return a
    * list of valid @{class:PhabricatorFileStorageEngine}s.
    *
    * If you are are extending this class to provide a custom selector, you
    * probably just want it to look like this:
    *
    *   return array(new MyCustomFileStorageEngine());
    *
    * ...that is, store every file in whatever storage engine you're using.
    * However, you can also provide multiple storage engines, or store some files
    * in one engine and some files in a different engine by implementing a more
    * complex selector.
    *
    * @param string  File data.
    * @param dict    Dictionary of optional file metadata. This may be empty, or
    *                have some additional keys like 'file' and 'author' which
    *                provide metadata.
    * @return list   List of @{class:PhabricatorFileStorageEngine}s, ordered by
    *                preference.
    * @task select
    */
   abstract public function selectStorageEngines($data, array $params);
 
 }
diff --git a/src/applications/files/exception/PhabricatorFileStorageConfigurationException.php b/src/applications/files/exception/PhabricatorFileStorageConfigurationException.php
index a561dfb06c..ec81bc3f22 100644
--- a/src/applications/files/exception/PhabricatorFileStorageConfigurationException.php
+++ b/src/applications/files/exception/PhabricatorFileStorageConfigurationException.php
@@ -1,12 +1,8 @@
 <?php
 
 /**
  * Thrown by storage engines to indicate an configuration error which should
  * abort the storage attempt, as opposed to a transient storage error which
  * should be retried on other engines.
- *
- * @group files
  */
-final class PhabricatorFileStorageConfigurationException extends Exception {
-
-}
+final class PhabricatorFileStorageConfigurationException extends Exception {}
diff --git a/src/applications/files/mail/FileCreateMailReceiver.php b/src/applications/files/mail/FileCreateMailReceiver.php
index fb11b7ba63..955c4db547 100644
--- a/src/applications/files/mail/FileCreateMailReceiver.php
+++ b/src/applications/files/mail/FileCreateMailReceiver.php
@@ -1,74 +1,70 @@
 <?php
 
-/**
- * @group files
- */
-final class FileCreateMailReceiver
-  extends PhabricatorMailReceiver {
+final class FileCreateMailReceiver extends PhabricatorMailReceiver {
 
   public function isEnabled() {
     $app_class = 'PhabricatorApplicationFiles';
     return PhabricatorApplication::isClassInstalled($app_class);
   }
 
   public function canAcceptMail(PhabricatorMetaMTAReceivedMail $mail) {
     $config_key = 'metamta.files.public-create-email';
     $create_address = PhabricatorEnv::getEnvConfig($config_key);
     if (!$create_address) {
       return false;
     }
 
     foreach ($mail->getToAddresses() as $to_address) {
       if ($this->matchAddresses($create_address, $to_address)) {
         return true;
       }
     }
 
     return false;
   }
 
   protected function processReceivedMail(
     PhabricatorMetaMTAReceivedMail $mail,
     PhabricatorUser $sender) {
 
     $attachment_phids = $mail->getAttachments();
     if (empty($attachment_phids)) {
       throw new PhabricatorMetaMTAReceivedMailProcessingException(
         MetaMTAReceivedMailStatus::STATUS_UNHANDLED_EXCEPTION,
         'Ignoring email to create files that did not include attachments.');
     }
     $first_phid = head($attachment_phids);
     $mail->setRelatedPHID($first_phid);
 
     $attachment_count = count($attachment_phids);
     if ($attachment_count > 1) {
       $subject = pht(
         'You successfully uploaded %d files.',
         $attachment_count);
     } else {
       $subject = pht('You successfully uploaded a file.');
     }
     $subject_prefix =
       PhabricatorEnv::getEnvConfig('metamta.files.subject-prefix');
 
     $file_uris = array();
     foreach ($attachment_phids as $phid) {
       $file_uris[] =
         PhabricatorEnv::getProductionURI('/file/info/'.$phid.'/');
     }
 
     $body = new PhabricatorMetaMTAMailBody();
     $body->addRawSection($subject);
     $body->addTextSection(pht('FILE LINKS'), implode("\n", $file_uris));
 
     id(new PhabricatorMetaMTAMail())
       ->addTos(array($sender->getPHID()))
       ->setSubject($subject)
       ->setSubjectPrefix($subject_prefix)
       ->setFrom($sender->getPHID())
       ->setRelatedPHID($first_phid)
       ->setBody($body->render())
       ->saveAndSend();
   }
 
 }
diff --git a/src/applications/files/mail/FileMailReceiver.php b/src/applications/files/mail/FileMailReceiver.php
index a0ab1e9111..0ddb913745 100644
--- a/src/applications/files/mail/FileMailReceiver.php
+++ b/src/applications/files/mail/FileMailReceiver.php
@@ -1,40 +1,37 @@
 <?php
 
-/**
- * @group file
- */
 final class FileMailReceiver extends PhabricatorObjectMailReceiver {
 
   public function isEnabled() {
     $app_class = 'PhabricatorApplicationFiles';
     return PhabricatorApplication::isClassInstalled($app_class);
   }
 
   protected function getObjectPattern() {
     return 'F[1-9]\d*';
   }
 
   protected function loadObject($pattern, PhabricatorUser $viewer) {
     $id = (int)trim($pattern, 'F');
 
     return id(new PhabricatorPasteQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->executeOne();
   }
 
   protected function processReceivedObjectMail(
     PhabricatorMetaMTAReceivedMail $mail,
     PhabricatorLiskDAO $object,
     PhabricatorUser $sender) {
 
     $handler = id(new FileReplyHandler())
       ->setMailReceiver($object);
 
     $handler->setActor($sender);
     $handler->setExcludeMailRecipientPHIDs(
       $mail->loadExcludeMailRecipientPHIDs());
     $handler->processEmail($mail);
   }
 
 }
diff --git a/src/applications/files/mail/FileReplyHandler.php b/src/applications/files/mail/FileReplyHandler.php
index 077b9d121e..99da44afb3 100644
--- a/src/applications/files/mail/FileReplyHandler.php
+++ b/src/applications/files/mail/FileReplyHandler.php
@@ -1,81 +1,77 @@
 <?php
 
-/**
- * @group file
- */
 final class FileReplyHandler extends PhabricatorMailReplyHandler {
 
   public function validateMailReceiver($mail_receiver) {
     if (!($mail_receiver instanceof PhabricatorFile)) {
       throw new Exception('Mail receiver is not a PhabricatorFile.');
     }
   }
 
   public function getPrivateReplyHandlerEmailAddress(
     PhabricatorObjectHandle $handle) {
     return $this->getDefaultPrivateReplyHandlerEmailAddress($handle, 'F');
   }
 
   public function getPublicReplyHandlerEmailAddress() {
     return $this->getDefaultPublicReplyHandlerEmailAddress('F');
   }
 
   public function getReplyHandlerInstructions() {
     if ($this->supportsReplies()) {
       return pht('Reply to comment or !unsubscribe.');
     } else {
       return null;
     }
   }
 
   protected function receiveEmail(PhabricatorMetaMTAReceivedMail $mail) {
     $actor = $this->getActor();
     $file = $this->getMailReceiver();
 
     $body_data = $mail->parseBody();
     $body = $body_data['body'];
     $body = $this->enhanceBodyWithAttachments($body, $mail->getAttachments());
 
     $content_source = PhabricatorContentSource::newForSource(
       PhabricatorContentSource::SOURCE_EMAIL,
       array(
         'id' => $mail->getID(),
       ));
 
     $xactions = array();
     $command = $body_data['body'];
 
     switch ($command) {
       case 'unsubscribe':
         $xaction = id(new PhabricatorFileTransaction())
           ->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS)
           ->setNewValue(array('-' => array($actor->getPHID())));
         $xactions[] = $xaction;
         break;
     }
 
     $xactions[] = id(new PhabricatorFileTransaction())
       ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
       ->attachComment(
        id(new PhabricatorFileTransactionComment())
         ->setContent($body));
 
     $editor = id(new PhabricatorFileEditor())
       ->setActor($actor)
       ->setContentSource($content_source)
       ->setContinueOnNoEffect(true)
       ->setIsPreview(false);
 
     try {
       $xactions = $editor->applyTransactions($file, $xactions);
     } catch (PhabricatorApplicationTransactionNoEffectException $ex) {
       // just do nothing, though unclear why you're sending a blank email
       return true;
     }
 
     $head_xaction = head($xactions);
     return $head_xaction->getID();
-
   }
 
 }
diff --git a/src/applications/files/query/PhabricatorFileQuery.php b/src/applications/files/query/PhabricatorFileQuery.php
index f3243fe1fa..f4af58646f 100644
--- a/src/applications/files/query/PhabricatorFileQuery.php
+++ b/src/applications/files/query/PhabricatorFileQuery.php
@@ -1,256 +1,253 @@
 <?php
 
-/**
- * @group file
- */
 final class PhabricatorFileQuery
   extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $ids;
   private $phids;
   private $authorPHIDs;
   private $explicitUploads;
   private $transforms;
   private $dateCreatedAfter;
   private $dateCreatedBefore;
   private $contentHashes;
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
     return $this;
   }
 
   public function withPHIDs(array $phids) {
     $this->phids = $phids;
     return $this;
   }
 
   public function withAuthorPHIDs(array $phids) {
     $this->authorPHIDs = $phids;
     return $this;
   }
 
   public function withDateCreatedBefore($date_created_before) {
     $this->dateCreatedBefore = $date_created_before;
     return $this;
   }
 
   public function withDateCreatedAfter($date_created_after) {
     $this->dateCreatedAfter = $date_created_after;
     return $this;
   }
 
   public function withContentHashes(array $content_hashes) {
     $this->contentHashes = $content_hashes;
     return $this;
   }
 
   /**
    * Select files which are transformations of some other file. For example,
    * you can use this query to find previously generated thumbnails of an image
    * file.
    *
    * As a parameter, provide a list of transformation specifications. Each
    * specification is a dictionary with the keys `originalPHID` and `transform`.
    * The `originalPHID` is the PHID of the original file (the file which was
    * transformed) and the `transform` is the name of the transform to query
    * for. If you pass `true` as the `transform`, all transformations of the
    * file will be selected.
    *
    * For example:
    *
    *   array(
    *     array(
    *       'originalPHID' => 'PHID-FILE-aaaa',
    *       'transform'    => 'sepia',
    *     ),
    *     array(
    *       'originalPHID' => 'PHID-FILE-bbbb',
    *       'transform'    => true,
    *     ),
    *   )
    *
    * This selects the `"sepia"` transformation of the file with PHID
    * `PHID-FILE-aaaa` and all transformations of the file with PHID
    * `PHID-FILE-bbbb`.
    *
    * @param list<dict>  List of transform specifications, described above.
    * @return this
    */
   public function withTransforms(array $specs) {
     foreach ($specs as $spec) {
       if (!is_array($spec) ||
           empty($spec['originalPHID']) ||
           empty($spec['transform'])) {
         throw new Exception(
           "Transform specification must be a dictionary with keys ".
           "'originalPHID' and 'transform'!");
       }
     }
 
     $this->transforms = $specs;
     return $this;
   }
 
   public function showOnlyExplicitUploads($explicit_uploads) {
     $this->explicitUploads = $explicit_uploads;
     return $this;
   }
 
   protected function loadPage() {
     $table = new PhabricatorFile();
     $conn_r = $table->establishConnection('r');
 
     $data = queryfx_all(
       $conn_r,
       'SELECT f.* FROM %T f %Q %Q %Q %Q',
       $table->getTableName(),
       $this->buildJoinClause($conn_r),
       $this->buildWhereClause($conn_r),
       $this->buildOrderClause($conn_r),
       $this->buildLimitClause($conn_r));
 
     $files = $table->loadAllFromArray($data);
 
     if (!$files) {
       return $files;
     }
 
     // We need to load attached objects to perform policy checks for files.
     // First, load the edges.
 
     $edge_type = PhabricatorEdgeConfig::TYPE_FILE_HAS_OBJECT;
     $phids = mpull($files, 'getPHID');
     $edges = id(new PhabricatorEdgeQuery())
       ->withSourcePHIDs($phids)
       ->withEdgeTypes(array($edge_type))
       ->execute();
 
     $object_phids = array();
     foreach ($files as $file) {
       $phids = array_keys($edges[$file->getPHID()][$edge_type]);
       $file->attachObjectPHIDs($phids);
       foreach ($phids as $phid) {
         $object_phids[$phid] = true;
       }
     }
     $object_phids = array_keys($object_phids);
 
     // Now, load the objects.
 
     $objects = array();
     if ($object_phids) {
       $objects = id(new PhabricatorObjectQuery())
         ->setParentQuery($this)
         ->setViewer($this->getViewer())
         ->withPHIDs($object_phids)
         ->execute();
       $objects = mpull($objects, null, 'getPHID');
     }
 
     foreach ($files as $file) {
       $file_objects = array_select_keys($objects, $file->getObjectPHIDs());
       $file->attachObjects($file_objects);
     }
 
     return $files;
   }
 
   private function buildJoinClause(AphrontDatabaseConnection $conn_r) {
     $joins = array();
 
     if ($this->transforms) {
       $joins[] = qsprintf(
         $conn_r,
         'JOIN %T t ON t.transformedPHID = f.phid',
         id(new PhabricatorTransformedFile())->getTableName());
     }
 
     return implode(' ', $joins);
   }
 
   private function buildWhereClause(AphrontDatabaseConnection $conn_r) {
     $where = array();
 
     $where[] = $this->buildPagingClause($conn_r);
 
     if ($this->ids) {
       $where[] = qsprintf(
         $conn_r,
         'f.id IN (%Ld)',
         $this->ids);
     }
 
     if ($this->phids) {
       $where[] = qsprintf(
         $conn_r,
         'f.phid IN (%Ls)',
         $this->phids);
     }
 
     if ($this->authorPHIDs) {
       $where[] = qsprintf(
         $conn_r,
         'f.authorPHID IN (%Ls)',
         $this->authorPHIDs);
     }
 
     if ($this->explicitUploads) {
       $where[] = qsprintf(
         $conn_r,
         'f.isExplicitUpload = true');
     }
 
     if ($this->transforms) {
       $clauses = array();
       foreach ($this->transforms as $transform) {
         if ($transform['transform'] === true) {
           $clauses[] = qsprintf(
             $conn_r,
             '(t.originalPHID = %s)',
             $transform['originalPHID']);
         } else {
           $clauses[] = qsprintf(
             $conn_r,
             '(t.originalPHID = %s AND t.transform = %s)',
             $transform['originalPHID'],
             $transform['transform']);
         }
       }
       $where[] = qsprintf($conn_r, '(%Q)', implode(') OR (', $clauses));
     }
 
     if ($this->dateCreatedAfter) {
       $where[] = qsprintf(
         $conn_r,
         'f.dateCreated >= %d',
         $this->dateCreatedAfter);
     }
 
     if ($this->dateCreatedBefore) {
       $where[] = qsprintf(
         $conn_r,
         'f.dateCreated <= %d',
         $this->dateCreatedBefore);
     }
 
     if ($this->contentHashes) {
       $where[] = qsprintf(
         $conn_r,
         'f.contentHash IN (%Ls)',
         $this->contentHashes);
     }
 
     return $this->formatWhereClause($where);
   }
 
   protected function getPagingColumn() {
     return 'f.id';
   }
 
 
   public function getQueryApplicationClass() {
     return 'PhabricatorApplicationFiles';
   }
 
 }
diff --git a/src/applications/files/query/PhabricatorFileTransactionQuery.php b/src/applications/files/query/PhabricatorFileTransactionQuery.php
index 18688b0af1..72bca16d60 100644
--- a/src/applications/files/query/PhabricatorFileTransactionQuery.php
+++ b/src/applications/files/query/PhabricatorFileTransactionQuery.php
@@ -1,13 +1,10 @@
 <?php
 
-/**
- * @group file
- */
 final class PhabricatorFileTransactionQuery
   extends PhabricatorApplicationTransactionQuery {
 
   public function getTemplateApplicationTransaction() {
     return new PhabricatorFileTransaction();
   }
 
 }
diff --git a/src/applications/files/storage/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php
index df8b005d1d..edf288935e 100644
--- a/src/applications/files/storage/PhabricatorFile.php
+++ b/src/applications/files/storage/PhabricatorFile.php
@@ -1,955 +1,949 @@
 <?php
 
-/**
- * @group file
- */
 final class PhabricatorFile extends PhabricatorFileDAO
   implements
     PhabricatorTokenReceiverInterface,
     PhabricatorSubscribableInterface,
     PhabricatorFlaggableInterface,
     PhabricatorPolicyInterface {
 
   const STORAGE_FORMAT_RAW  = 'raw';
 
   const METADATA_IMAGE_WIDTH  = 'width';
   const METADATA_IMAGE_HEIGHT = 'height';
 
   protected $name;
   protected $mimeType;
   protected $byteSize;
   protected $authorPHID;
   protected $secretKey;
   protected $contentHash;
   protected $metadata = array();
   protected $mailKey;
 
   protected $storageEngine;
   protected $storageFormat;
   protected $storageHandle;
 
   protected $ttl;
   protected $isExplicitUpload = 1;
   protected $viewPolicy = PhabricatorPolicies::POLICY_USER;
 
   private $objects = self::ATTACHABLE;
   private $objectPHIDs = self::ATTACHABLE;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
       self::CONFIG_SERIALIZATION => array(
         'metadata' => self::SERIALIZATION_JSON,
       ),
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
       PhabricatorFilePHIDTypeFile::TYPECONST);
   }
 
   public function save() {
     if (!$this->getSecretKey()) {
       $this->setSecretKey($this->generateSecretKey());
     }
     if (!$this->getMailKey()) {
       $this->setMailKey(Filesystem::readRandomCharacters(20));
     }
     return parent::save();
   }
 
   public static function readUploadedFileData($spec) {
     if (!$spec) {
       throw new Exception('No file was uploaded!');
     }
 
     $err = idx($spec, 'error');
     if ($err) {
       throw new PhabricatorFileUploadException($err);
     }
 
     $tmp_name = idx($spec, 'tmp_name');
     $is_valid = @is_uploaded_file($tmp_name);
     if (!$is_valid) {
       throw new Exception('File is not an uploaded file.');
     }
 
     $file_data = Filesystem::readFile($tmp_name);
     $file_size = idx($spec, 'size');
 
     if (strlen($file_data) != $file_size) {
       throw new Exception('File size disagrees with uploaded size.');
     }
 
     self::validateFileSize(strlen($file_data));
 
     return $file_data;
   }
 
   public static function newFromPHPUpload($spec, array $params = array()) {
     $file_data = self::readUploadedFileData($spec);
 
     $file_name = nonempty(
       idx($params, 'name'),
       idx($spec,   'name'));
     $params = array(
       'name' => $file_name,
     ) + $params;
 
     return self::newFromFileData($file_data, $params);
   }
 
   public static function newFromXHRUpload($data, array $params = array()) {
     self::validateFileSize(strlen($data));
     return self::newFromFileData($data, $params);
   }
 
   private static function validateFileSize($size) {
     $limit = PhabricatorEnv::getEnvConfig('storage.upload-size-limit');
     if (!$limit) {
       return;
     }
 
     $limit = phabricator_parse_bytes($limit);
     if ($size > $limit) {
       throw new PhabricatorFileUploadException(-1000);
     }
   }
 
 
   /**
    * Given a block of data, try to load an existing file with the same content
    * if one exists. If it does not, build a new file.
    *
    * This method is generally used when we have some piece of semi-trusted data
    * like a diff or a file from a repository that we want to show to the user.
    * We can't just dump it out because it may be dangerous for any number of
    * reasons; instead, we need to serve it through the File abstraction so it
    * ends up on the CDN domain if one is configured and so on. However, if we
    * simply wrote a new file every time we'd potentially end up with a lot
    * of redundant data in file storage.
    *
    * To solve these problems, we use file storage as a cache and reuse the
    * same file again if we've previously written it.
    *
    * NOTE: This method unguards writes.
    *
    * @param string  Raw file data.
    * @param dict    Dictionary of file information.
    */
   public static function buildFromFileDataOrHash(
     $data,
     array $params = array()) {
 
     $file = id(new PhabricatorFile())->loadOneWhere(
       'name = %s AND contentHash = %s LIMIT 1',
       self::normalizeFileName(idx($params, 'name')),
       self::hashFileContent($data));
 
     if (!$file) {
       $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
       $file = PhabricatorFile::newFromFileData($data, $params);
       unset($unguarded);
     }
 
     return $file;
   }
 
   public static function newFileFromContentHash($hash, $params) {
-
     // Check to see if a file with same contentHash exist
     $file = id(new PhabricatorFile())->loadOneWhere(
       'contentHash = %s LIMIT 1', $hash);
 
     if ($file) {
       // copy storageEngine, storageHandle, storageFormat
       $copy_of_storage_engine = $file->getStorageEngine();
       $copy_of_storage_handle = $file->getStorageHandle();
       $copy_of_storage_format = $file->getStorageFormat();
       $copy_of_byteSize = $file->getByteSize();
       $copy_of_mimeType = $file->getMimeType();
 
       $file_name = idx($params, 'name');
       $file_name = self::normalizeFileName($file_name);
       $file_ttl = idx($params, 'ttl');
       $authorPHID = idx($params, 'authorPHID');
 
       $new_file = new PhabricatorFile();
 
       $new_file->setName($file_name);
       $new_file->setByteSize($copy_of_byteSize);
       $new_file->setAuthorPHID($authorPHID);
       $new_file->setTtl($file_ttl);
 
       if (idx($params, 'viewPolicy')) {
         $new_file->setViewPolicy($params['viewPolicy']);
       }
 
       $new_file->setContentHash($hash);
       $new_file->setStorageEngine($copy_of_storage_engine);
       $new_file->setStorageHandle($copy_of_storage_handle);
       $new_file->setStorageFormat($copy_of_storage_format);
       $new_file->setMimeType($copy_of_mimeType);
       $new_file->copyDimensions($file);
 
       $new_file->save();
 
       return $new_file;
     }
 
     return $file;
   }
 
   private static function buildFromFileData($data, array $params = array()) {
     $selector = PhabricatorEnv::newObjectFromConfig('storage.engine-selector');
 
     if (isset($params['storageEngines'])) {
       $engines = $params['storageEngines'];
     } else {
       $selector = PhabricatorEnv::newObjectFromConfig(
         'storage.engine-selector');
       $engines = $selector->selectStorageEngines($data, $params);
     }
 
     assert_instances_of($engines, 'PhabricatorFileStorageEngine');
     if (!$engines) {
       throw new Exception('No valid storage engines are available!');
     }
 
     $file = new PhabricatorFile();
 
     $data_handle = null;
     $engine_identifier = null;
     $exceptions = array();
     foreach ($engines as $engine) {
       $engine_class = get_class($engine);
       try {
         list($engine_identifier, $data_handle) = $file->writeToEngine(
           $engine,
           $data,
           $params);
 
         // We stored the file somewhere so stop trying to write it to other
         // places.
         break;
       } catch (PhabricatorFileStorageConfigurationException $ex) {
         // If an engine is outright misconfigured (or misimplemented), raise
         // that immediately since it probably needs attention.
         throw $ex;
       } catch (Exception $ex) {
         phlog($ex);
 
         // If an engine doesn't work, keep trying all the other valid engines
         // in case something else works.
         $exceptions[$engine_class] = $ex;
       }
     }
 
     if (!$data_handle) {
       throw new PhutilAggregateException(
         'All storage engines failed to write file:',
         $exceptions);
     }
 
     $file_name = idx($params, 'name');
     $file_name = self::normalizeFileName($file_name);
     $file_ttl = idx($params, 'ttl');
 
     // If for whatever reason, authorPHID isn't passed as a param
     // (always the case with newFromFileDownload()), store a ''
     $authorPHID = idx($params, 'authorPHID');
 
     $file->setName($file_name);
     $file->setByteSize(strlen($data));
     $file->setAuthorPHID($authorPHID);
     $file->setTtl($file_ttl);
     $file->setContentHash(self::hashFileContent($data));
 
     if (idx($params, 'viewPolicy')) {
       $file->setViewPolicy($params['viewPolicy']);
     }
 
     $file->setStorageEngine($engine_identifier);
     $file->setStorageHandle($data_handle);
 
     // TODO: This is probably YAGNI, but allows for us to do encryption or
     // compression later if we want.
     $file->setStorageFormat(self::STORAGE_FORMAT_RAW);
     $file->setIsExplicitUpload(idx($params, 'isExplicitUpload') ? 1 : 0);
 
     if (isset($params['mime-type'])) {
       $file->setMimeType($params['mime-type']);
     } else {
       $tmp = new TempFile();
       Filesystem::writeFile($tmp, $data);
       $file->setMimeType(Filesystem::getMimeType($tmp));
     }
 
     try {
       $file->updateDimensions(false);
     } catch (Exception $ex) {
       // Do nothing
     }
 
     $file->save();
 
     return $file;
   }
 
   public static function newFromFileData($data, array $params = array()) {
     $hash = self::hashFileContent($data);
     $file = self::newFileFromContentHash($hash, $params);
 
     if ($file) {
       return $file;
     }
 
     return self::buildFromFileData($data, $params);
   }
 
   public function migrateToEngine(PhabricatorFileStorageEngine $engine) {
     if (!$this->getID() || !$this->getStorageHandle()) {
       throw new Exception(
         "You can not migrate a file which hasn't yet been saved.");
     }
 
     $data = $this->loadFileData();
     $params = array(
       'name' => $this->getName(),
     );
 
     list($new_identifier, $new_handle) = $this->writeToEngine(
       $engine,
       $data,
       $params);
 
     $old_engine = $this->instantiateStorageEngine();
     $old_handle = $this->getStorageHandle();
 
     $this->setStorageEngine($new_identifier);
     $this->setStorageHandle($new_handle);
     $this->save();
 
     $old_engine->deleteFile($old_handle);
 
     return $this;
   }
 
   private function writeToEngine(
     PhabricatorFileStorageEngine $engine,
     $data,
     array $params) {
 
     $engine_class = get_class($engine);
 
     $data_handle = $engine->writeFile($data, $params);
 
     if (!$data_handle || strlen($data_handle) > 255) {
       // This indicates an improperly implemented storage engine.
       throw new PhabricatorFileStorageConfigurationException(
         "Storage engine '{$engine_class}' executed writeFile() but did ".
         "not return a valid handle ('{$data_handle}') to the data: it ".
         "must be nonempty and no longer than 255 characters.");
     }
 
     $engine_identifier = $engine->getEngineIdentifier();
     if (!$engine_identifier || strlen($engine_identifier) > 32) {
       throw new PhabricatorFileStorageConfigurationException(
         "Storage engine '{$engine_class}' returned an improper engine ".
         "identifier '{$engine_identifier}': it must be nonempty ".
         "and no longer than 32 characters.");
     }
 
     return array($engine_identifier, $data_handle);
   }
 
 
   public static function newFromFileDownload($uri, array $params = array()) {
     // Make sure we're allowed to make a request first
     if (!PhabricatorEnv::getEnvConfig('security.allow-outbound-http')) {
       throw new Exception('Outbound HTTP requests are disabled!');
     }
 
     $uri = new PhutilURI($uri);
 
     $protocol = $uri->getProtocol();
     switch ($protocol) {
       case 'http':
       case 'https':
         break;
       default:
         // Make sure we are not accessing any file:// URIs or similar.
         return null;
     }
 
     $timeout = 5;
 
     list($file_data) = id(new HTTPSFuture($uri))
         ->setTimeout($timeout)
         ->resolvex();
 
     $params = $params + array(
       'name' => basename($uri),
     );
 
     return self::newFromFileData($file_data, $params);
   }
 
   public static function normalizeFileName($file_name) {
     $pattern = "@[\\x00-\\x19#%&+!~'\$\"\/=\\\\?<> ]+@";
     $file_name = preg_replace($pattern, '_', $file_name);
     $file_name = preg_replace('@_+@', '_', $file_name);
     $file_name = trim($file_name, '_');
 
     $disallowed_filenames = array(
       '.'  => 'dot',
       '..' => 'dotdot',
       ''   => 'file',
     );
     $file_name = idx($disallowed_filenames, $file_name, $file_name);
 
     return $file_name;
   }
 
   public function delete() {
-
     // We want to delete all the rows which mark this file as the transformation
     // of some other file (since we're getting rid of it). We also delete all
     // the transformations of this file, so that a user who deletes an image
     // doesn't need to separately hunt down and delete a bunch of thumbnails and
     // resizes of it.
 
     $outbound_xforms = id(new PhabricatorFileQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withTransforms(
         array(
           array(
             'originalPHID' => $this->getPHID(),
             'transform'    => true,
           ),
         ))
       ->execute();
 
     foreach ($outbound_xforms as $outbound_xform) {
       $outbound_xform->delete();
     }
 
     $inbound_xforms = id(new PhabricatorTransformedFile())->loadAllWhere(
       'transformedPHID = %s',
       $this->getPHID());
 
     $this->openTransaction();
       foreach ($inbound_xforms as $inbound_xform) {
         $inbound_xform->delete();
       }
       $ret = parent::delete();
     $this->saveTransaction();
 
     // Check to see if other files are using storage
     $other_file = id(new PhabricatorFile())->loadAllWhere(
       'storageEngine = %s AND storageHandle = %s AND
       storageFormat = %s AND id != %d LIMIT 1',
       $this->getStorageEngine(),
       $this->getStorageHandle(),
       $this->getStorageFormat(),
       $this->getID());
 
     // If this is the only file using the storage, delete storage
     if (!$other_file) {
       $engine = $this->instantiateStorageEngine();
       try {
         $engine->deleteFile($this->getStorageHandle());
       } catch (Exception $ex) {
         // In the worst case, we're leaving some data stranded in a storage
         // engine, which is fine.
         phlog($ex);
       }
     }
 
     return $ret;
   }
 
   public static function hashFileContent($data) {
     return sha1($data);
   }
 
   public function loadFileData() {
 
     $engine = $this->instantiateStorageEngine();
     $data = $engine->readFile($this->getStorageHandle());
 
     switch ($this->getStorageFormat()) {
       case self::STORAGE_FORMAT_RAW:
         $data = $data;
         break;
       default:
         throw new Exception('Unknown storage format.');
     }
 
     return $data;
   }
 
   public function getViewURI() {
     if (!$this->getPHID()) {
       throw new Exception(
         'You must save a file before you can generate a view URI.');
     }
 
     $name = phutil_escape_uri($this->getName());
 
     $path = '/file/data/'.$this->getSecretKey().'/'.$this->getPHID().'/'.$name;
     return PhabricatorEnv::getCDNURI($path);
   }
 
   public function getInfoURI() {
     return '/file/info/'.$this->getPHID().'/';
   }
 
   public function getBestURI() {
     if ($this->isViewableInBrowser()) {
       return $this->getViewURI();
     } else {
       return $this->getInfoURI();
     }
   }
 
   public function getDownloadURI() {
     $uri = id(new PhutilURI($this->getViewURI()))
       ->setQueryParam('download', true);
     return (string) $uri;
   }
 
   public function getProfileThumbURI() {
     $path = '/file/xform/thumb-profile/'.$this->getPHID().'/'
       .$this->getSecretKey().'/';
     return PhabricatorEnv::getCDNURI($path);
   }
 
   public function getThumb60x45URI() {
     $path = '/file/xform/thumb-60x45/'.$this->getPHID().'/'
       .$this->getSecretKey().'/';
     return PhabricatorEnv::getCDNURI($path);
   }
 
   public function getThumb160x120URI() {
     $path = '/file/xform/thumb-160x120/'.$this->getPHID().'/'
       .$this->getSecretKey().'/';
     return PhabricatorEnv::getCDNURI($path);
   }
 
   public function getPreview100URI() {
     $path = '/file/xform/preview-100/'.$this->getPHID().'/'
       .$this->getSecretKey().'/';
     return PhabricatorEnv::getCDNURI($path);
   }
 
   public function getPreview220URI() {
     $path = '/file/xform/preview-220/'.$this->getPHID().'/'
       .$this->getSecretKey().'/';
     return PhabricatorEnv::getCDNURI($path);
   }
 
   public function getThumb220x165URI() {
     $path = '/file/xform/thumb-220x165/'.$this->getPHID().'/'
       .$this->getSecretKey().'/';
     return PhabricatorEnv::getCDNURI($path);
   }
 
   public function getThumb280x210URI() {
     $path = '/file/xform/thumb-280x210/'.$this->getPHID().'/'
       .$this->getSecretKey().'/';
     return PhabricatorEnv::getCDNURI($path);
   }
 
   public function isViewableInBrowser() {
     return ($this->getViewableMimeType() !== null);
   }
 
   public function isViewableImage() {
     if (!$this->isViewableInBrowser()) {
       return false;
     }
 
     $mime_map = PhabricatorEnv::getEnvConfig('files.image-mime-types');
     $mime_type = $this->getMimeType();
     return idx($mime_map, $mime_type);
   }
 
   public function isAudio() {
     if (!$this->isViewableInBrowser()) {
       return false;
     }
 
     $mime_map = PhabricatorEnv::getEnvConfig('files.audio-mime-types');
     $mime_type = $this->getMimeType();
     return idx($mime_map, $mime_type);
   }
 
   public function isTransformableImage() {
-
     // NOTE: The way the 'gd' extension works in PHP is that you can install it
     // with support for only some file types, so it might be able to handle
     // PNG but not JPEG. Try to generate thumbnails for whatever we can. Setup
     // warns you if you don't have complete support.
 
     $matches = null;
     $ok = preg_match(
       '@^image/(gif|png|jpe?g)@',
       $this->getViewableMimeType(),
       $matches);
     if (!$ok) {
       return false;
     }
 
     switch ($matches[1]) {
       case 'jpg';
       case 'jpeg':
         return function_exists('imagejpeg');
         break;
       case 'png':
         return function_exists('imagepng');
         break;
       case 'gif':
         return function_exists('imagegif');
         break;
       default:
         throw new Exception('Unknown type matched as image MIME type.');
     }
   }
 
   public static function getTransformableImageFormats() {
     $supported = array();
 
     if (function_exists('imagejpeg')) {
       $supported[] = 'jpg';
     }
 
     if (function_exists('imagepng')) {
       $supported[] = 'png';
     }
 
     if (function_exists('imagegif')) {
       $supported[] = 'gif';
     }
 
     return $supported;
   }
 
   protected function instantiateStorageEngine() {
     return self::buildEngine($this->getStorageEngine());
   }
 
   public static function buildEngine($engine_identifier) {
     $engines = self::buildAllEngines();
     foreach ($engines as $engine) {
       if ($engine->getEngineIdentifier() == $engine_identifier) {
         return $engine;
       }
     }
 
     throw new Exception(
       "Storage engine '{$engine_identifier}' could not be located!");
   }
 
   public static function buildAllEngines() {
     $engines = id(new PhutilSymbolLoader())
       ->setType('class')
       ->setConcreteOnly(true)
       ->setAncestorClass('PhabricatorFileStorageEngine')
       ->selectAndLoadSymbols();
 
     $results = array();
     foreach ($engines as $engine_class) {
       $results[] = newv($engine_class['name'], array());
     }
 
     return $results;
   }
 
   public function getViewableMimeType() {
     $mime_map = PhabricatorEnv::getEnvConfig('files.viewable-mime-types');
 
     $mime_type = $this->getMimeType();
     $mime_parts = explode(';', $mime_type);
     $mime_type = trim(reset($mime_parts));
 
     return idx($mime_map, $mime_type);
   }
 
   public function getDisplayIconForMimeType() {
     $mime_map = PhabricatorEnv::getEnvConfig('files.icon-mime-types');
     $mime_type = $this->getMimeType();
     return idx($mime_map, $mime_type, 'docs_file');
   }
 
   public function validateSecretKey($key) {
     return ($key == $this->getSecretKey());
   }
 
   public function generateSecretKey() {
     return Filesystem::readRandomCharacters(20);
   }
 
   public function updateDimensions($save = true) {
     if (!$this->isViewableImage()) {
       throw new Exception(
         'This file is not a viewable image.');
     }
 
     if (!function_exists('imagecreatefromstring')) {
       throw new Exception(
         'Cannot retrieve image information.');
     }
 
     $data = $this->loadFileData();
 
     $img = imagecreatefromstring($data);
     if ($img === false) {
       throw new Exception(
         'Error when decoding image.');
     }
 
     $this->metadata[self::METADATA_IMAGE_WIDTH] = imagesx($img);
     $this->metadata[self::METADATA_IMAGE_HEIGHT] = imagesy($img);
 
     if ($save) {
       $this->save();
     }
 
     return $this;
   }
 
   public function copyDimensions(PhabricatorFile $file) {
     $metadata = $file->getMetadata();
     $width = idx($metadata, self::METADATA_IMAGE_WIDTH);
     if ($width) {
       $this->metadata[self::METADATA_IMAGE_WIDTH] = $width;
     }
     $height = idx($metadata, self::METADATA_IMAGE_HEIGHT);
     if ($height) {
       $this->metadata[self::METADATA_IMAGE_HEIGHT] = $height;
     }
 
     return $this;
   }
 
 
   /**
    * Load (or build) the {@class:PhabricatorFile} objects for builtin file
    * resources. The builtin mechanism allows files shipped with Phabricator
    * to be treated like normal files so that APIs do not need to special case
    * things like default images or deleted files.
    *
    * Builtins are located in `resources/builtin/` and identified by their
    * name.
    *
    * @param  PhabricatorUser                Viewing user.
    * @param  list<string>                   List of builtin file names.
    * @return dict<string, PhabricatorFile>  Dictionary of named builtins.
    */
   public static function loadBuiltins(PhabricatorUser $user, array $names) {
     $specs = array();
     foreach ($names as $name) {
       $specs[] = array(
         'originalPHID' => PhabricatorPHIDConstants::PHID_VOID,
         'transform'    => 'builtin:'.$name,
       );
     }
 
     // NOTE: Anyone is allowed to access builtin files.
 
     $files = id(new PhabricatorFileQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withTransforms($specs)
       ->execute();
 
     $files = mpull($files, null, 'getName');
 
     $root = dirname(phutil_get_library_root('phabricator'));
     $root = $root.'/resources/builtin/';
 
     $build = array();
     foreach ($names as $name) {
       if (isset($files[$name])) {
         continue;
       }
 
       // This is just a sanity check to prevent loading arbitrary files.
       if (basename($name) != $name) {
         throw new Exception("Invalid builtin name '{$name}'!");
       }
 
       $path = $root.$name;
 
       if (!Filesystem::pathExists($path)) {
         throw new Exception("Builtin '{$path}' does not exist!");
       }
 
       $data = Filesystem::readFile($path);
       $params = array(
         'name' => $name,
         'ttl'  => time() + (60 * 60 * 24 * 7),
       );
 
       $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
         $file = PhabricatorFile::newFromFileData($data, $params);
         $xform = id(new PhabricatorTransformedFile())
           ->setOriginalPHID(PhabricatorPHIDConstants::PHID_VOID)
           ->setTransform('builtin:'.$name)
           ->setTransformedPHID($file->getPHID())
           ->save();
       unset($unguarded);
 
       $file->attachObjectPHIDs(array());
       $file->attachObjects(array());
 
       $files[$name] = $file;
     }
 
     return $files;
   }
 
 
   /**
    * Convenience wrapper for @{method:loadBuiltins}.
    *
    * @param PhabricatorUser   Viewing user.
    * @param string            Single builtin name to load.
    * @return PhabricatorFile  Corresponding builtin file.
    */
   public static function loadBuiltin(PhabricatorUser $user, $name) {
     return idx(self::loadBuiltins($user, array($name)), $name);
   }
 
   public function getObjects() {
     return $this->assertAttached($this->objects);
   }
 
   public function attachObjects(array $objects) {
     $this->objects = $objects;
     return $this;
   }
 
   public function getObjectPHIDs() {
     return $this->assertAttached($this->objectPHIDs);
   }
 
   public function attachObjectPHIDs(array $object_phids) {
     $this->objectPHIDs = $object_phids;
     return $this;
   }
 
   public function getImageHeight() {
     if (!$this->isViewableImage()) {
       return null;
     }
     return idx($this->metadata, self::METADATA_IMAGE_HEIGHT);
   }
 
   public function getImageWidth() {
     if (!$this->isViewableImage()) {
       return null;
     }
     return idx($this->metadata, self::METADATA_IMAGE_WIDTH);
   }
 
   /**
    * Write the policy edge between this file and some object.
    *
    * @param PhabricatorUser Acting user.
    * @param phid Object PHID to attach to.
    * @return this
    */
   public function attachToObject(PhabricatorUser $actor, $phid) {
     $edge_type = PhabricatorEdgeConfig::TYPE_OBJECT_HAS_FILE;
 
     id(new PhabricatorEdgeEditor())
       ->setActor($actor)
       ->setSuppressEvents(true)
       ->addEdge($phid, $edge_type, $this->getPHID())
       ->save();
 
     return $this;
   }
 
 
 /* -(  PhabricatorPolicyInterface Implementation  )-------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
     );
   }
 
   public function getPolicy($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         return $this->getViewPolicy();
       case PhabricatorPolicyCapability::CAN_EDIT:
         return PhabricatorPolicies::POLICY_NOONE;
     }
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     $viewer_phid = $viewer->getPHID();
     if ($viewer_phid) {
       if ($this->getAuthorPHID() == $viewer_phid) {
         return true;
       }
     }
 
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         // If you can see any object this file is attached to, you can see
         // the file.
         return (count($this->getObjects()) > 0);
     }
 
     return false;
   }
 
   public function describeAutomaticCapability($capability) {
     $out = array();
     $out[] = pht('The user who uploaded a file can always view and edit it.');
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         $out[] = pht(
           'Files attached to objects are visible to users who can view '.
           'those objects.');
         break;
     }
 
     return $out;
   }
 
 
 /* -(  PhabricatorSubscribableInterface Implementation  )-------------------- */
 
 
   public function isAutomaticallySubscribed($phid) {
     return ($this->authorPHID == $phid);
   }
 
   public function shouldShowSubscribersProperty() {
     return true;
   }
 
   public function shouldAllowSubscription($phid) {
     return true;
   }
 
 
 /* -(  PhabricatorTokenReceiverInterface  )---------------------------------- */
 
 
   public function getUsersToNotifyOfTokenGiven() {
     return array(
       $this->getAuthorPHID(),
     );
   }
 
 
 }
diff --git a/src/applications/files/storage/PhabricatorFileDAO.php b/src/applications/files/storage/PhabricatorFileDAO.php
index b8999a7122..e8a49b7a46 100644
--- a/src/applications/files/storage/PhabricatorFileDAO.php
+++ b/src/applications/files/storage/PhabricatorFileDAO.php
@@ -1,12 +1,9 @@
 <?php
 
-/**
- * @group file
- */
 abstract class PhabricatorFileDAO extends PhabricatorLiskDAO {
 
   public function getApplicationName() {
     return 'file';
   }
 
 }
diff --git a/src/applications/files/storage/PhabricatorFileTransaction.php b/src/applications/files/storage/PhabricatorFileTransaction.php
index 02a2f1670b..5983d4a00f 100644
--- a/src/applications/files/storage/PhabricatorFileTransaction.php
+++ b/src/applications/files/storage/PhabricatorFileTransaction.php
@@ -1,21 +1,18 @@
 <?php
 
-/**
- * @group file
- */
 final class PhabricatorFileTransaction
   extends PhabricatorApplicationTransaction {
 
   public function getApplicationName() {
     return 'file';
   }
 
   public function getApplicationTransactionType() {
     return PhabricatorFilePHIDTypeFile::TYPECONST;
   }
 
   public function getApplicationTransactionCommentObject() {
     return new PhabricatorFileTransactionComment();
   }
 
 }
diff --git a/src/applications/files/storage/PhabricatorFileTransactionComment.php b/src/applications/files/storage/PhabricatorFileTransactionComment.php
index 9323d49159..625c1c1b4e 100644
--- a/src/applications/files/storage/PhabricatorFileTransactionComment.php
+++ b/src/applications/files/storage/PhabricatorFileTransactionComment.php
@@ -1,17 +1,15 @@
 <?php
 
-/**
- * @group file
- */
 final class PhabricatorFileTransactionComment
   extends PhabricatorApplicationTransactionComment {
 
   public function getApplicationTransactionObject() {
     return new PhabricatorFileTransaction();
   }
 
   public function shouldUseMarkupCache($field) {
     // Only cache submitted comments.
     return ($this->getTransactionPHID() != null);
   }
+
 }
diff --git a/src/applications/files/storage/PhabricatorTransformedFile.php b/src/applications/files/storage/PhabricatorTransformedFile.php
index cc28210efa..e77f1ddffb 100644
--- a/src/applications/files/storage/PhabricatorTransformedFile.php
+++ b/src/applications/files/storage/PhabricatorTransformedFile.php
@@ -1,12 +1,9 @@
 <?php
 
-/**
- * @group file
- */
 final class PhabricatorTransformedFile extends PhabricatorFileDAO {
 
   protected $originalPHID;
   protected $transform;
   protected $transformedPHID;
 
 }
diff --git a/src/applications/files/storage/__tests__/PhabricatorFileTestCase.php b/src/applications/files/storage/__tests__/PhabricatorFileTestCase.php
index eee9bbf949..b55f98ac01 100644
--- a/src/applications/files/storage/__tests__/PhabricatorFileTestCase.php
+++ b/src/applications/files/storage/__tests__/PhabricatorFileTestCase.php
@@ -1,254 +1,250 @@
 <?php
 
-/**
- * @group file
- */
 final class PhabricatorFileTestCase extends PhabricatorTestCase {
 
   public function getPhabricatorTestCaseConfiguration() {
     return array(
       self::PHABRICATOR_TESTCONFIG_BUILD_STORAGE_FIXTURES => true,
     );
   }
 
   public function testFileStorageReadWrite() {
     $engine = new PhabricatorTestStorageEngine();
 
     $data = Filesystem::readRandomCharacters(64);
 
     $params = array(
       'name' => 'test.dat',
       'storageEngines' => array(
         $engine,
       ),
     );
 
     $file = PhabricatorFile::newFromFileData($data, $params);
 
     // Test that the storage engine worked, and was the target of the write. We
     // don't actually care what the data is (future changes may compress or
     // encrypt it), just that it exists in the test storage engine.
     $engine->readFile($file->getStorageHandle());
 
     // Now test that we get the same data back out.
     $this->assertEqual($data, $file->loadFileData());
   }
 
   public function testFileStorageUploadDifferentFiles() {
     $engine = new PhabricatorTestStorageEngine();
 
     $data = Filesystem::readRandomCharacters(64);
     $other_data = Filesystem::readRandomCharacters(64);
 
     $params = array(
       'name' => 'test.dat',
       'storageEngines' => array(
         $engine,
       ),
     );
 
     $first_file = PhabricatorFile::newFromFileData($data, $params);
 
     $second_file = PhabricatorFile::newFromFileData($other_data, $params);
 
     // Test that the the second file uses  different storage handle from
     // the first file.
     $first_handle = $first_file->getStorageHandle();
     $second_handle = $second_file->getStorageHandle();
 
     $this->assertTrue($first_handle != $second_handle);
   }
 
-
   public function testFileStorageUploadSameFile() {
     $engine = new PhabricatorTestStorageEngine();
 
     $data = Filesystem::readRandomCharacters(64);
 
     $params = array(
       'name' => 'test.dat',
       'storageEngines' => array(
         $engine,
       ),
     );
 
     $first_file = PhabricatorFile::newFromFileData($data, $params);
 
     $second_file = PhabricatorFile::newFromFileData($data, $params);
 
     // Test that the the second file uses the same storage handle as
     // the first file.
     $handle = $first_file->getStorageHandle();
     $second_handle = $second_file->getStorageHandle();
 
     $this->assertEqual($handle, $second_handle);
   }
 
   public function testFileStorageDelete() {
     $engine = new PhabricatorTestStorageEngine();
 
     $data = Filesystem::readRandomCharacters(64);
 
     $params = array(
       'name' => 'test.dat',
       'storageEngines' => array(
         $engine,
       ),
     );
 
     $file = PhabricatorFile::newFromFileData($data, $params);
     $handle = $file->getStorageHandle();
     $file->delete();
 
     $caught = null;
     try {
       $engine->readFile($handle);
     } catch (Exception $ex) {
       $caught = $ex;
     }
 
     $this->assertTrue($caught instanceof Exception);
   }
 
   public function testFileStorageDeleteSharedHandle() {
     $engine = new PhabricatorTestStorageEngine();
 
     $data = Filesystem::readRandomCharacters(64);
 
     $params = array(
       'name' => 'test.dat',
       'storageEngines' => array(
         $engine,
       ),
     );
 
     $first_file = PhabricatorFile::newFromFileData($data, $params);
     $second_file = PhabricatorFile::newFromFileData($data, $params);
     $first_file->delete();
 
     $this->assertEqual($data, $second_file->loadFileData());
   }
 
   public function testReadWriteTtlFiles() {
     $engine = new PhabricatorTestStorageEngine();
 
     $data = Filesystem::readRandomCharacters(64);
 
     $ttl = (time() + 60 * 60 * 24);
 
     $params = array(
       'name' => 'test.dat',
       'ttl'  => ($ttl),
       'storageEngines' => array(
         $engine,
       ),
     );
 
     $file = PhabricatorFile::newFromFileData($data, $params);
     $this->assertEqual($ttl, $file->getTTL());
   }
 
   public function testFileTransformDelete() {
     // We want to test that a file deletes all its inbound transformation
     // records and outbound transformed derivatives when it is deleted.
 
     // First, we create a chain of transforms, A -> B -> C.
 
     $engine = new PhabricatorTestStorageEngine();
 
     $params = array(
       'name' => 'test.txt',
       'storageEngines' => array(
         $engine,
       ),
     );
 
     $a = PhabricatorFile::newFromFileData('a', $params);
     $b = PhabricatorFile::newFromFileData('b', $params);
     $c = PhabricatorFile::newFromFileData('c', $params);
 
     id(new PhabricatorTransformedFile())
       ->setOriginalPHID($a->getPHID())
       ->setTransform('test:a->b')
       ->setTransformedPHID($b->getPHID())
       ->save();
 
     id(new PhabricatorTransformedFile())
       ->setOriginalPHID($b->getPHID())
       ->setTransform('test:b->c')
       ->setTransformedPHID($c->getPHID())
       ->save();
 
     // Now, verify that A -> B and B -> C exist.
 
     $xform_a = id(new PhabricatorFileQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withTransforms(
         array(
           array(
             'originalPHID' => $a->getPHID(),
             'transform'    => true,
           ),
         ))
       ->execute();
 
     $this->assertEqual(1, count($xform_a));
     $this->assertEqual($b->getPHID(), head($xform_a)->getPHID());
 
     $xform_b = id(new PhabricatorFileQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withTransforms(
         array(
           array(
             'originalPHID' => $b->getPHID(),
             'transform'    => true,
           ),
         ))
       ->execute();
 
     $this->assertEqual(1, count($xform_b));
     $this->assertEqual($c->getPHID(), head($xform_b)->getPHID());
 
     // Delete "B".
 
     $b->delete();
 
     // Now, verify that the A -> B and B -> C links are gone.
 
     $xform_a = id(new PhabricatorFileQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withTransforms(
         array(
           array(
             'originalPHID' => $a->getPHID(),
             'transform'    => true,
           ),
         ))
       ->execute();
 
     $this->assertEqual(0, count($xform_a));
 
     $xform_b = id(new PhabricatorFileQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withTransforms(
         array(
           array(
             'originalPHID' => $b->getPHID(),
             'transform'    => true,
           ),
         ))
       ->execute();
 
     $this->assertEqual(0, count($xform_b));
 
     // Also verify that C has been deleted.
 
     $alternate_c = id(new PhabricatorFileQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withPHIDs(array($c->getPHID()))
       ->execute();
 
     $this->assertEqual(array(), $alternate_c);
   }
 
 }
diff --git a/src/applications/flag/conduit/ConduitAPI_flag_Method.php b/src/applications/flag/conduit/ConduitAPI_flag_Method.php
index 177d057e45..f37c9c5b4d 100644
--- a/src/applications/flag/conduit/ConduitAPI_flag_Method.php
+++ b/src/applications/flag/conduit/ConduitAPI_flag_Method.php
@@ -1,44 +1,41 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class ConduitAPI_flag_Method extends ConduitAPIMethod {
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
       'PhabricatorApplicationFlags');
   }
 
   protected function attachHandleToFlag($flag, PhabricatorUser $user) {
     $handle = id(new PhabricatorHandleQuery())
       ->setViewer($user)
       ->withPHIDs(array($flag->getObjectPHID()))
       ->executeOne();
     $flag->attachHandle($handle);
   }
 
   protected function buildFlagInfoDictionary($flag) {
     $color = $flag->getColor();
     $uri = PhabricatorEnv::getProductionURI($flag->getHandle()->getURI());
 
     return array(
       'id'            => $flag->getID(),
       'ownerPHID'     => $flag->getOwnerPHID(),
       'type'          => $flag->getType(),
       'objectPHID'    => $flag->getObjectPHID(),
       'reasonPHID'    => $flag->getReasonPHID(),
       'color'         => $color,
       'colorName'     => PhabricatorFlagColor::getColorName($color),
       'note'          => $flag->getNote(),
       'handle'        => array(
         'uri'         => $uri,
         'name'        => $flag->getHandle()->getName(),
         'fullname'    => $flag->getHandle()->getFullName(),
       ),
       'dateCreated'   => $flag->getDateCreated(),
       'dateModified'  => $flag->getDateModified(),
     );
   }
 
 }
diff --git a/src/applications/flag/conduit/ConduitAPI_flag_delete_Method.php b/src/applications/flag/conduit/ConduitAPI_flag_delete_Method.php
index 7dce64e320..864e4922ef 100644
--- a/src/applications/flag/conduit/ConduitAPI_flag_delete_Method.php
+++ b/src/applications/flag/conduit/ConduitAPI_flag_delete_Method.php
@@ -1,59 +1,56 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_flag_delete_Method extends ConduitAPI_flag_Method {
 
   public function getMethodDescription() {
     return 'Clear a flag.';
   }
 
   public function defineParamTypes() {
     return array(
       'id'         => 'optional id',
       'objectPHID' => 'optional phid',
     );
   }
 
   public function defineReturnType() {
     return 'dict | null';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_NOT_FOUND'  => 'Bad flag ID.',
       'ERR_WRONG_USER' => 'You are not the creator of this flag.',
       'ERR_NEED_PARAM' => 'Must pass an id or an objectPHID.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $id = $request->getValue('id');
     $object = $request->getValue('objectPHID');
     if ($id) {
       $flag = id(new PhabricatorFlag())->load($id);
       if (!$flag) {
         throw new ConduitException('ERR_NOT_FOUND');
       }
       if ($flag->getOwnerPHID() != $request->getUser()->getPHID()) {
         throw new ConduitException('ERR_WRONG_USER');
       }
     } else if ($object) {
       $flag = id(new PhabricatorFlag())->loadOneWhere(
         'objectPHID = %s AND ownerPHID = %s',
         $object,
         $request->getUser()->getPHID());
       if (!$flag) {
         return null;
       }
     } else {
       throw new ConduitException('ERR_NEED_PARAM');
     }
     $this->attachHandleToFlag($flag, $request->getUser());
     $ret = $this->buildFlagInfoDictionary($flag);
     $flag->delete();
     return $ret;
   }
 
 }
diff --git a/src/applications/flag/conduit/ConduitAPI_flag_edit_Method.php b/src/applications/flag/conduit/ConduitAPI_flag_edit_Method.php
index 9f5ed860a6..cc520c605d 100644
--- a/src/applications/flag/conduit/ConduitAPI_flag_edit_Method.php
+++ b/src/applications/flag/conduit/ConduitAPI_flag_edit_Method.php
@@ -1,64 +1,61 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_flag_edit_Method extends ConduitAPI_flag_Method {
 
   public function getMethodDescription() {
     return 'Create or modify a flag.';
   }
 
   public function defineParamTypes() {
     return array(
       'objectPHID' => 'required phid',
       'color'      => 'optional int',
       'note'       => 'optional string',
     );
   }
 
   public function defineReturnType() {
     return 'dict';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $user = $request->getUser()->getPHID();
     $phid = $request->getValue('objectPHID');
     $new = false;
 
     $flag = id(new PhabricatorFlag())->loadOneWhere(
       'objectPHID = %s AND ownerPHID = %s',
       $phid,
       $user);
     if ($flag) {
       $params = $request->getAllParameters();
       if (isset($params['color'])) {
         $flag->setColor($params['color']);
       }
       if (isset($params['note'])) {
         $flag->setNote($params['note']);
       }
     } else {
       $default_color = PhabricatorFlagColor::COLOR_BLUE;
       $flag = id(new PhabricatorFlag())
         ->setOwnerPHID($user)
         ->setType(phid_get_type($phid))
         ->setObjectPHID($phid)
         ->setReasonPHID($user)
         ->setColor($request->getValue('color', $default_color))
         ->setNote($request->getValue('note', ''));
       $new = true;
     }
     $this->attachHandleToFlag($flag, $request->getUser());
     $flag->save();
     $ret = $this->buildFlagInfoDictionary($flag);
     $ret['new'] = $new;
     return $ret;
   }
 
 }
diff --git a/src/applications/flag/conduit/ConduitAPI_flag_query_Method.php b/src/applications/flag/conduit/ConduitAPI_flag_query_Method.php
index c968061855..ec776a157f 100644
--- a/src/applications/flag/conduit/ConduitAPI_flag_query_Method.php
+++ b/src/applications/flag/conduit/ConduitAPI_flag_query_Method.php
@@ -1,67 +1,63 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_flag_query_Method extends ConduitAPI_flag_Method {
 
   public function getMethodDescription() {
     return 'Query flag markers.';
   }
 
   public function defineParamTypes() {
     return array(
       'ownerPHIDs'    => 'optional list<phid>',
       'types'         => 'optional list<type>',
       'objectPHIDs'   => 'optional list<phid>',
 
       'offset'        => 'optional int',
       'limit'         => 'optional int (default = 100)',
     );
   }
 
   public function defineReturnType() {
     return 'list<dict>';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
-
     $query = new PhabricatorFlagQuery();
     $query->setViewer($request->getUser());
 
     $owner_phids = $request->getValue('ownerPHIDs', array());
     if ($owner_phids) {
       $query->withOwnerPHIDs($owner_phids);
     }
 
     $object_phids = $request->getValue('objectPHIDs', array());
     if ($object_phids) {
       $query->withObjectPHIDs($object_phids);
     }
 
     $types = $request->getValue('types', array());
     if ($types) {
       $query->withTypes($types);
     }
 
     $query->needHandles(true);
 
     $query->setOffset($request->getValue('offset', 0));
     $query->setLimit($request->getValue('limit', 100));
 
     $flags = $query->execute();
 
     $results = array();
     foreach ($flags as $flag) {
       $results[] = $this->buildFlagInfoDictionary($flag);
     }
 
     return $results;
   }
 
 }
diff --git a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
index 45dad6f344..49f91d8690 100644
--- a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
@@ -1,388 +1,388 @@
 <?php
 
 final class HarbormasterPlanViewController
   extends HarbormasterPlanController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $id = $this->id;
 
     $plan = id(new HarbormasterBuildPlanQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->executeOne();
     if (!$plan) {
       return new Aphront404Response();
     }
 
     $xactions = id(new HarbormasterBuildPlanTransactionQuery())
       ->setViewer($viewer)
       ->withObjectPHIDs(array($plan->getPHID()))
       ->execute();
 
     $xaction_view = id(new PhabricatorApplicationTransactionView())
       ->setUser($viewer)
       ->setObjectPHID($plan->getPHID())
       ->setTransactions($xactions)
       ->setShouldTerminate(true);
 
     $title = pht('Plan %d', $id);
 
     $header = id(new PHUIHeaderView())
       ->setHeader($title)
       ->setUser($viewer)
       ->setPolicyObject($plan);
 
     $box = id(new PHUIObjectBoxView())
       ->setHeader($header);
 
     $actions = $this->buildActionList($plan);
     $this->buildPropertyLists($box, $plan, $actions);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Plan %d', $id));
 
     list($step_list, $has_any_conflicts) = $this->buildStepList($plan);
 
     if ($has_any_conflicts) {
       $box->setFormErrors(
         array(
           pht(
             'This build plan has conflicts in one or more build steps. '.
             'Examine the step list and resolve the listed errors.'),
         ));
     }
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $box,
         $step_list,
         $xaction_view,
       ),
       array(
         'title' => $title,
       ));
   }
 
   private function buildStepList(HarbormasterBuildPlan $plan) {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $list_id = celerity_generate_unique_node_id();
 
     $steps = id(new HarbormasterBuildStepQuery())
       ->setViewer($viewer)
       ->withBuildPlanPHIDs(array($plan->getPHID()))
       ->execute();
 
     $can_edit = $this->hasApplicationCapability(
       HarbormasterCapabilityManagePlans::CAPABILITY);
 
     $i = 1;
     $step_list = id(new PHUIObjectItemListView())
       ->setUser($viewer)
       ->setNoDataString(
         pht('This build plan does not have any build steps yet.'))
       ->setID($list_id);
     Javelin::initBehavior(
       'harbormaster-reorder-steps',
       array(
         'listID' => $list_id,
         'orderURI' => '/harbormaster/plan/order/'.$plan->getID().'/',
       ));
 
     $has_any_conflicts = false;
     foreach ($steps as $step) {
       $implementation = null;
       try {
         $implementation = $step->getStepImplementation();
       } catch (Exception $ex) {
-        // We can't initialize the implementation.  This might be because
+        // We can't initialize the implementation. This might be because
         // it's been renamed or no longer exists.
         $item = id(new PHUIObjectItemView())
           ->setObjectName(pht('Step %d', $i++))
           ->setHeader(pht('Unknown Implementation'))
           ->setBarColor('red')
           ->addAttribute(pht(
             'This step has an invalid implementation (%s).',
             $step->getClassName()))
           ->addAction(
             id(new PHUIListItemView())
               ->setIcon('fa-times')
               ->addSigil('harbormaster-build-step-delete')
               ->setWorkflow(true)
               ->setRenderNameAsTooltip(true)
               ->setName(pht('Delete'))
               ->setHref(
                 $this->getApplicationURI('step/delete/'.$step->getID().'/')));
         $step_list->addItem($item);
         continue;
       }
       $item = id(new PHUIObjectItemView())
         ->setObjectName('Step '.$i++)
         ->setHeader($step->getName());
 
       $item->addAttribute($implementation->getDescription());
 
       $step_id = $step->getID();
       $edit_uri = $this->getApplicationURI("step/edit/{$step_id}/");
       $delete_uri = $this->getApplicationURI("step/delete/{$step_id}/");
 
       if ($can_edit) {
         $item->setHref($edit_uri);
         $item->setGrippable(true);
         $item->addSigil('build-step');
         $item->setMetadata(
           array(
             'stepID' => $step->getID(),
           ));
       }
 
       $item
         ->setHref($edit_uri)
         ->addAction(
           id(new PHUIListItemView())
             ->setIcon('fa-times')
             ->addSigil('harbormaster-build-step-delete')
             ->setWorkflow(true)
             ->setDisabled(!$can_edit)
             ->setHref(
               $this->getApplicationURI('step/delete/'.$step->getID().'/')));
 
       $inputs = $step->getStepImplementation()->getArtifactInputs();
       $outputs = $step->getStepImplementation()->getArtifactOutputs();
 
       $has_conflicts = false;
       if ($inputs || $outputs) {
         $available_artifacts =
           HarbormasterBuildStepImplementation::loadAvailableArtifacts(
             $plan,
             $step,
             null);
 
         list($inputs_ui, $has_conflicts) = $this->buildArtifactList(
             $inputs,
             'in',
             pht('Input Artifacts'),
             $available_artifacts);
 
         list($outputs_ui) = $this->buildArtifactList(
             $outputs,
             'out',
             pht('Output Artifacts'),
             array());
 
         $item->appendChild(
           phutil_tag(
             'div',
             array(
               'class' => 'harbormaster-artifact-io',
             ),
             array(
               $inputs_ui,
               $outputs_ui,
             )));
       }
 
       if ($has_conflicts) {
         $has_any_conflicts = true;
         $item->setBarColor('red');
       }
 
       $step_list->addItem($item);
     }
 
     return array($step_list, $has_any_conflicts);
   }
 
   private function buildActionList(HarbormasterBuildPlan $plan) {
     $request = $this->getRequest();
     $viewer = $request->getUser();
     $id = $plan->getID();
 
     $list = id(new PhabricatorActionListView())
       ->setUser($viewer)
       ->setObject($plan)
       ->setObjectURI($this->getApplicationURI("plan/{$id}/"));
 
     $can_edit = $this->hasApplicationCapability(
       HarbormasterCapabilityManagePlans::CAPABILITY);
 
     $list->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Edit Plan'))
         ->setHref($this->getApplicationURI("plan/edit/{$id}/"))
         ->setWorkflow(!$can_edit)
         ->setDisabled(!$can_edit)
         ->setIcon('fa-pencil'));
 
     if ($plan->isDisabled()) {
       $list->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('Enable Plan'))
           ->setHref($this->getApplicationURI("plan/disable/{$id}/"))
           ->setWorkflow(true)
           ->setDisabled(!$can_edit)
           ->setIcon('fa-check'));
     } else {
       $list->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('Disable Plan'))
           ->setHref($this->getApplicationURI("plan/disable/{$id}/"))
           ->setWorkflow(true)
           ->setDisabled(!$can_edit)
           ->setIcon('fa-ban'));
     }
 
     $list->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Add Build Step'))
         ->setHref($this->getApplicationURI("step/add/{$id}/"))
         ->setWorkflow(true)
         ->setDisabled(!$can_edit)
         ->setIcon('fa-plus'));
 
     $list->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Run Plan Manually'))
         ->setHref($this->getApplicationURI("plan/run/{$id}/"))
         ->setWorkflow(true)
         ->setDisabled(!$can_edit)
         ->setIcon('fa-play-circle'));
 
     return $list;
   }
 
   private function buildPropertyLists(
     PHUIObjectBoxView $box,
     HarbormasterBuildPlan $plan,
     PhabricatorActionListView $actions) {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $properties = id(new PHUIPropertyListView())
       ->setUser($viewer)
       ->setObject($plan)
       ->setActionList($actions);
     $box->addPropertyList($properties);
 
     $properties->addProperty(
       pht('Created'),
       phabricator_datetime($plan->getDateCreated(), $viewer));
 
   }
 
   private function buildArtifactList(
     array $artifacts,
     $kind,
     $name,
     array $available_artifacts) {
     $has_conflicts = false;
 
     if (!$artifacts) {
       return array(null, $has_conflicts);
     }
 
 
     $this->requireResource('harbormaster-css');
 
     $header = phutil_tag(
       'div',
       array(
         'class' => 'harbormaster-artifact-summary-header',
       ),
       $name);
 
     $is_input = ($kind == 'in');
 
     $list = new PHUIStatusListView();
     foreach ($artifacts as $artifact) {
       $error = null;
 
       $key = idx($artifact, 'key');
       if (!strlen($key)) {
         $bound = phutil_tag('em', array(), pht('(null)'));
         if ($is_input) {
           // This is an unbound input. For now, all inputs are always required.
           $icon = PHUIStatusItemView::ICON_WARNING;
           $color = 'red';
           $icon_label = pht('Required Input');
           $has_conflicts = true;
           $error = pht('This input is required, but not configured.');
         } else {
           // This is an unnamed output. Outputs do not necessarily need to be
           // named.
           $icon = PHUIStatusItemView::ICON_OPEN;
           $color = 'bluegrey';
           $icon_label = pht('Unused Output');
         }
       } else {
         $bound = phutil_tag('strong', array(), $key);
         if ($is_input) {
           if (isset($available_artifacts[$key])) {
             if ($available_artifacts[$key] == idx($artifact, 'type')) {
               $icon = PHUIStatusItemView::ICON_ACCEPT;
               $color = 'green';
               $icon_label = pht('Valid Input');
             } else {
               $icon = PHUIStatusItemView::ICON_WARNING;
               $color = 'red';
               $icon_label = pht('Bad Input Type');
               $has_conflicts = true;
               $error = pht(
                 'This input is bound to the wrong artifact type. It is bound '.
                 'to a "%s" artifact, but should be bound to a "%s" artifact.',
                 $available_artifacts[$key],
                 idx($artifact, 'type'));
             }
           } else {
             $icon = PHUIStatusItemView::ICON_QUESTION;
             $color = 'red';
             $icon_label = pht('Unknown Input');
             $has_conflicts = true;
             $error = pht(
               'This input is bound to an artifact ("%s") which does not exist '.
               'at this stage in the build process.',
               $key);
           }
         } else {
           $icon = PHUIStatusItemView::ICON_DOWN;
           $color = 'green';
           $icon_label = pht('Valid Output');
         }
       }
 
       if ($error) {
         $note = array(
           phutil_tag('strong', array(), pht('ERROR:')),
           ' ',
           $error);
       } else {
         $note = $bound;
       }
 
       $list->addItem(
         id(new PHUIStatusItemView())
           ->setIcon($icon, $color, $icon_label)
           ->setTarget($artifact['name'])
           ->setNote($note));
     }
 
     $ui = array(
       $header,
       $list,
     );
 
     return array($ui, $has_conflicts);
   }
 
 }
diff --git a/src/applications/harbormaster/query/HarbormasterBuildTransactionQuery.php b/src/applications/harbormaster/query/HarbormasterBuildTransactionQuery.php
index ede890bc3a..2d697f1ad2 100644
--- a/src/applications/harbormaster/query/HarbormasterBuildTransactionQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildTransactionQuery.php
@@ -1,13 +1,10 @@
 <?php
 
-/**
- * @group harbormaster
- */
 final class HarbormasterBuildTransactionQuery
   extends PhabricatorApplicationTransactionQuery {
 
   public function getTemplateApplicationTransaction() {
     return new HarbormasterBuildTransaction();
   }
 
 }
diff --git a/src/applications/harbormaster/query/HarbormasterBuildableTransactionQuery.php b/src/applications/harbormaster/query/HarbormasterBuildableTransactionQuery.php
index ccad15fd8f..c6aeccc198 100644
--- a/src/applications/harbormaster/query/HarbormasterBuildableTransactionQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildableTransactionQuery.php
@@ -1,13 +1,10 @@
 <?php
 
-/**
- * @group harbormaster
- */
 final class HarbormasterBuildableTransactionQuery
   extends PhabricatorApplicationTransactionQuery {
 
   public function getTemplateApplicationTransaction() {
     return new HarbormasterBuildableTransaction();
   }
 
 }
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
index f400895d13..8c4a7a11a8 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
@@ -1,193 +1,193 @@
 <?php
 
 final class HarbormasterBuildLog extends HarbormasterDAO
   implements PhabricatorPolicyInterface {
 
   protected $buildTargetPHID;
   protected $logSource;
   protected $logType;
   protected $duration;
   protected $live;
 
   private $buildTarget = self::ATTACHABLE;
 
   const CHUNK_BYTE_LIMIT = 102400;
 
   /**
    * The log is encoded as plain text.
    */
   const ENCODING_TEXT = 'text';
 
   public static function initializeNewBuildLog(
     HarbormasterBuildTarget $build_target) {
 
     return id(new HarbormasterBuildLog())
       ->setBuildTargetPHID($build_target->getPHID())
       ->setDuration(null)
       ->setLive(0);
   }
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
       HarbormasterPHIDTypeBuildLog::TYPECONST);
   }
 
   public function attachBuildTarget(HarbormasterBuildTarget $build_target) {
     $this->buildTarget = $build_target;
     return $this;
   }
 
   public function getBuildTarget() {
     return $this->assertAttached($this->buildTarget);
   }
 
   public function getName() {
     return pht('Build Log');
   }
 
   public function start() {
     if ($this->getLive()) {
       throw new Exception('Live logging has already started for this log.');
     }
 
     $this->setLive(1);
     $this->save();
 
     return time();
   }
 
   public function append($content) {
     if (!$this->getLive()) {
       throw new Exception('Start logging before appending data to the log.');
     }
     if (strlen($content) === 0) {
       return;
     }
 
     // If the length of the content is greater than the chunk size limit,
-    // then we can never fit the content in a single record.  We need to
+    // then we can never fit the content in a single record. We need to
     // split our content out and call append on it for as many parts as there
     // are to the content.
     if (strlen($content) > self::CHUNK_BYTE_LIMIT) {
       $current = $content;
       while (strlen($current) > self::CHUNK_BYTE_LIMIT) {
         $part = substr($current, 0, self::CHUNK_BYTE_LIMIT);
         $current = substr($current, self::CHUNK_BYTE_LIMIT);
         $this->append($part);
       }
       $this->append($current);
       return;
     }
 
-    // Retrieve the size of last chunk from the DB for this log.  If the
+    // Retrieve the size of last chunk from the DB for this log. If the
     // chunk is over 500K, then we need to create a new log entry.
     $conn = $this->establishConnection('w');
     $result = queryfx_all(
       $conn,
       'SELECT id, size, encoding '.
       'FROM harbormaster_buildlogchunk '.
       'WHERE logID = %d '.
       'ORDER BY id DESC '.
       'LIMIT 1',
       $this->getID());
     if (count($result) === 0 ||
       $result[0]['size'] + strlen($content) > self::CHUNK_BYTE_LIMIT ||
       $result[0]['encoding'] !== self::ENCODING_TEXT) {
 
       // We must insert a new chunk because the data we are appending
       // won't fit into the existing one, or we don't have any existing
       // chunk data.
       queryfx(
         $conn,
         'INSERT INTO harbormaster_buildlogchunk '.
         '(logID, encoding, size, chunk) '.
         'VALUES '.
         '(%d, %s, %d, %s)',
         $this->getID(),
         self::ENCODING_TEXT,
         strlen($content),
         $content);
     } else {
       // We have a resulting record that we can append our content onto.
       queryfx(
         $conn,
         'UPDATE harbormaster_buildlogchunk '.
         'SET chunk = CONCAT(chunk, %s), size = LENGTH(CONCAT(chunk, %s))'.
         'WHERE id = %d',
         $content,
         $content,
         $result[0]['id']);
     }
   }
 
   public function finalize($start = 0) {
     if (!$this->getLive()) {
       throw new Exception('Start logging before finalizing it.');
     }
 
     // TODO: Encode the log contents in a gzipped format.
     $this->reload();
     if ($start > 0) {
       $this->setDuration(time() - $start);
     }
     $this->setLive(0);
     $this->save();
   }
 
   public function getLogText() {
     // TODO: This won't cope very well if we're pulling like a 700MB
-    // log file out of the DB.  We should probably implement some sort
+    // log file out of the DB. We should probably implement some sort
     // of optional limit parameter so that when we're rendering out only
     // 25 lines in the UI, we don't wastefully read in the whole log.
 
     // We have to read our content out of the database and stitch all of
     // the log data back together.
     $conn = $this->establishConnection('r');
     $result = queryfx_all(
       $conn,
       'SELECT chunk '.
       'FROM harbormaster_buildlogchunk '.
       'WHERE logID = %d '.
       'ORDER BY id ASC',
       $this->getID());
 
     $content = '';
     foreach ($result as $row) {
       $content .= $row['chunk'];
     }
     return $content;
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
     );
   }
 
   public function getPolicy($capability) {
     return $this->getBuildTarget()->getPolicy($capability);
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return $this->getBuildTarget()->hasAutomaticCapability(
       $capability,
       $viewer);
   }
 
   public function describeAutomaticCapability($capability) {
     return pht(
       'Users must be able to see a build target to view it\'s build log.');
   }
 
 
 }
diff --git a/src/applications/herald/adapter/HeraldCommitAdapter.php b/src/applications/herald/adapter/HeraldCommitAdapter.php
index a3507db90b..db723d68ba 100644
--- a/src/applications/herald/adapter/HeraldCommitAdapter.php
+++ b/src/applications/herald/adapter/HeraldCommitAdapter.php
@@ -1,562 +1,560 @@
 <?php
 
-/**
- * @group herald
- */
 final class HeraldCommitAdapter extends HeraldAdapter {
 
   const FIELD_NEED_AUDIT_FOR_PACKAGE      = 'need-audit-for-package';
   const FIELD_REPOSITORY_AUTOCLOSE_BRANCH = 'repository-autoclose-branch';
 
   protected $diff;
   protected $revision;
 
   protected $repository;
   protected $commit;
   protected $commitData;
   private $commitDiff;
 
   protected $emailPHIDs = array();
   protected $addCCPHIDs = array();
   protected $auditMap = array();
   protected $buildPlans = array();
 
   protected $affectedPaths;
   protected $affectedRevision;
   protected $affectedPackages;
   protected $auditNeededPackages;
 
   public function getAdapterApplicationClass() {
     return 'PhabricatorApplicationDiffusion';
   }
 
   public function getObject() {
     return $this->commit;
   }
 
   public function getAdapterContentType() {
     return 'commit';
   }
 
   public function getAdapterContentName() {
     return pht('Commits');
   }
 
   public function getAdapterContentDescription() {
     return pht(
       "React to new commits appearing in tracked repositories.\n".
       "Commit rules can send email, flag commits, trigger audits, ".
       "and run build plans.");
   }
 
   public function supportsRuleType($rule_type) {
     switch ($rule_type) {
       case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL:
       case HeraldRuleTypeConfig::RULE_TYPE_PERSONAL:
       case HeraldRuleTypeConfig::RULE_TYPE_OBJECT:
         return true;
       default:
         return false;
     }
   }
 
   public function canTriggerOnObject($object) {
     if ($object instanceof PhabricatorRepository) {
       return true;
     }
     if ($object instanceof PhabricatorProject) {
       return true;
     }
     return false;
   }
 
   public function getTriggerObjectPHIDs() {
     return array_merge(
       array(
         $this->repository->getPHID(),
         $this->getPHID(),
       ),
       $this->repository->getProjectPHIDs());
   }
 
   public function explainValidTriggerObjects() {
     return pht(
       'This rule can trigger for **repositories** and **projects**.');
   }
 
   public function getFieldNameMap() {
     return array(
       self::FIELD_NEED_AUDIT_FOR_PACKAGE =>
         pht('Affected packages that need audit'),
       self::FIELD_REPOSITORY_AUTOCLOSE_BRANCH
         => pht('Commit is on closing branch'),
     ) + parent::getFieldNameMap();
   }
 
   public function getFields() {
     return array_merge(
       array(
         self::FIELD_BODY,
         self::FIELD_AUTHOR,
         self::FIELD_COMMITTER,
         self::FIELD_REVIEWER,
         self::FIELD_REPOSITORY,
         self::FIELD_REPOSITORY_PROJECTS,
         self::FIELD_DIFF_FILE,
         self::FIELD_DIFF_CONTENT,
         self::FIELD_DIFF_ADDED_CONTENT,
         self::FIELD_DIFF_REMOVED_CONTENT,
         self::FIELD_DIFF_ENORMOUS,
         self::FIELD_AFFECTED_PACKAGE,
         self::FIELD_AFFECTED_PACKAGE_OWNER,
         self::FIELD_NEED_AUDIT_FOR_PACKAGE,
         self::FIELD_DIFFERENTIAL_REVISION,
         self::FIELD_DIFFERENTIAL_ACCEPTED,
         self::FIELD_DIFFERENTIAL_REVIEWERS,
         self::FIELD_DIFFERENTIAL_CCS,
         self::FIELD_BRANCHES,
         self::FIELD_REPOSITORY_AUTOCLOSE_BRANCH,
       ),
       parent::getFields());
   }
 
   public function getConditionsForField($field) {
     switch ($field) {
       case self::FIELD_NEED_AUDIT_FOR_PACKAGE:
         return array(
           self::CONDITION_INCLUDE_ANY,
           self::CONDITION_INCLUDE_NONE,
         );
       case self::FIELD_REPOSITORY_AUTOCLOSE_BRANCH:
         return array(
           self::CONDITION_UNCONDITIONALLY,
         );
     }
     return parent::getConditionsForField($field);
   }
 
   public function getActions($rule_type) {
     switch ($rule_type) {
       case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL:
       case HeraldRuleTypeConfig::RULE_TYPE_OBJECT:
         return array_merge(
           array(
             self::ACTION_ADD_CC,
             self::ACTION_EMAIL,
             self::ACTION_AUDIT,
             self::ACTION_APPLY_BUILD_PLANS,
             self::ACTION_NOTHING
           ),
           parent::getActions($rule_type));
       case HeraldRuleTypeConfig::RULE_TYPE_PERSONAL:
         return array_merge(
           array(
             self::ACTION_ADD_CC,
             self::ACTION_EMAIL,
             self::ACTION_FLAG,
             self::ACTION_AUDIT,
             self::ACTION_NOTHING,
           ),
           parent::getActions($rule_type));
     }
   }
 
   public function getValueTypeForFieldAndCondition($field, $condition) {
     switch ($field) {
       case self::FIELD_DIFFERENTIAL_CCS:
         return self::VALUE_EMAIL;
       case self::FIELD_NEED_AUDIT_FOR_PACKAGE:
         return self::VALUE_OWNERS_PACKAGE;
     }
 
     return parent::getValueTypeForFieldAndCondition($field, $condition);
   }
 
   public static function newLegacyAdapter(
     PhabricatorRepository $repository,
     PhabricatorRepositoryCommit $commit,
     PhabricatorRepositoryCommitData $commit_data) {
 
     $object = new HeraldCommitAdapter();
 
     $commit->attachRepository($repository);
 
     $object->repository = $repository;
     $object->commit = $commit;
     $object->commitData = $commit_data;
 
     return $object;
   }
 
   public function setCommit(PhabricatorRepositoryCommit $commit) {
     $viewer = PhabricatorUser::getOmnipotentUser();
 
     $repository = id(new PhabricatorRepositoryQuery())
       ->setViewer($viewer)
       ->withIDs(array($commit->getRepositoryID()))
       ->needProjectPHIDs(true)
       ->executeOne();
     if (!$repository) {
       throw new Exception(pht('Unable to load repository!'));
     }
 
     $data = id(new PhabricatorRepositoryCommitData())->loadOneWhere(
       'commitID = %d',
       $commit->getID());
     if (!$data) {
       throw new Exception(pht('Unable to load commit data!'));
     }
 
     $this->commit = clone $commit;
     $this->commit->attachRepository($repository);
     $this->commit->attachCommitData($data);
 
     $this->repository = $repository;
     $this->commitData = $data;
 
     return $this;
   }
 
   public function getPHID() {
     return $this->commit->getPHID();
   }
 
   public function getEmailPHIDs() {
     return array_keys($this->emailPHIDs);
   }
 
   public function getAddCCMap() {
     return $this->addCCPHIDs;
   }
 
   public function getAuditMap() {
     return $this->auditMap;
   }
 
   public function getBuildPlans() {
     return $this->buildPlans;
   }
 
   public function getHeraldName() {
     return
       'r'.
       $this->repository->getCallsign().
       $this->commit->getCommitIdentifier();
   }
 
   public function loadAffectedPaths() {
     if ($this->affectedPaths === null) {
       $result = PhabricatorOwnerPathQuery::loadAffectedPaths(
         $this->repository,
         $this->commit,
         PhabricatorUser::getOmnipotentUser());
       $this->affectedPaths = $result;
     }
     return $this->affectedPaths;
   }
 
   public function loadAffectedPackages() {
     if ($this->affectedPackages === null) {
       $packages = PhabricatorOwnersPackage::loadAffectedPackages(
         $this->repository,
         $this->loadAffectedPaths());
       $this->affectedPackages = $packages;
     }
     return $this->affectedPackages;
   }
 
   public function loadAuditNeededPackage() {
     if ($this->auditNeededPackages === null) {
       $status_arr = array(
         PhabricatorAuditStatusConstants::AUDIT_REQUIRED,
         PhabricatorAuditStatusConstants::CONCERNED,
       );
       $requests = id(new PhabricatorRepositoryAuditRequest())
           ->loadAllWhere(
         'commitPHID = %s AND auditStatus IN (%Ls)',
         $this->commit->getPHID(),
         $status_arr);
 
       $packages = mpull($requests, 'getAuditorPHID');
       $this->auditNeededPackages = $packages;
     }
     return $this->auditNeededPackages;
   }
 
   public function loadDifferentialRevision() {
     if ($this->affectedRevision === null) {
       $this->affectedRevision = false;
       $data = $this->commitData;
       $revision_id = $data->getCommitDetail('differential.revisionID');
       if ($revision_id) {
         // NOTE: The Herald rule owner might not actually have access to
         // the revision, and can control which revision a commit is
         // associated with by putting text in the commit message. However,
         // the rules they can write against revisions don't actually expose
         // anything interesting, so it seems reasonable to load unconditionally
         // here.
 
         $revision = id(new DifferentialRevisionQuery())
           ->withIDs(array($revision_id))
           ->setViewer(PhabricatorUser::getOmnipotentUser())
           ->needRelationships(true)
           ->needReviewerStatus(true)
           ->executeOne();
         if ($revision) {
           $this->affectedRevision = $revision;
         }
       }
     }
     return $this->affectedRevision;
   }
 
   public static function getEnormousByteLimit() {
     return 1024 * 1024 * 1024; // 1GB
   }
 
   public static function getEnormousTimeLimit() {
     return 60 * 15; // 15 Minutes
   }
 
   private function loadCommitDiff() {
     $drequest = DiffusionRequest::newFromDictionary(
       array(
         'user' => PhabricatorUser::getOmnipotentUser(),
         'repository' => $this->repository,
         'commit' => $this->commit->getCommitIdentifier(),
       ));
 
     $byte_limit = self::getEnormousByteLimit();
 
     $raw = DiffusionQuery::callConduitWithDiffusionRequest(
       PhabricatorUser::getOmnipotentUser(),
       $drequest,
       'diffusion.rawdiffquery',
       array(
         'commit' => $this->commit->getCommitIdentifier(),
         'timeout' => self::getEnormousTimeLimit(),
         'byteLimit' => $byte_limit,
         'linesOfContext' => 0,
       ));
 
     if (strlen($raw) >= $byte_limit) {
       throw new Exception(
         pht(
           'The raw text of this change is enormous (larger than %d bytes). '.
           'Herald can not process it.',
           $byte_limit));
     }
 
     $parser = new ArcanistDiffParser();
     $changes = $parser->parseDiff($raw);
 
     $diff = DifferentialDiff::newFromRawChanges($changes);
     return $diff;
   }
 
   private function getDiffContent($type) {
     if ($this->commitDiff === null) {
       try {
         $this->commitDiff = $this->loadCommitDiff();
       } catch (Exception $ex) {
         $this->commitDiff = $ex;
         phlog($ex);
       }
     }
 
     if ($this->commitDiff instanceof Exception) {
       $ex = $this->commitDiff;
       $ex_class = get_class($ex);
       $ex_message = pht('Failed to load changes: %s', $ex->getMessage());
 
       return array(
         '<'.$ex_class.'>' => $ex_message,
       );
     }
 
     $changes = $this->commitDiff->getChangesets();
 
     $result = array();
     foreach ($changes as $change) {
       $lines = array();
       foreach ($change->getHunks() as $hunk) {
         switch ($type) {
           case '-':
             $lines[] = $hunk->makeOldFile();
             break;
           case '+':
             $lines[] = $hunk->makeNewFile();
             break;
           case '*':
             $lines[] = $hunk->makeChanges();
             break;
           default:
             throw new Exception("Unknown content selection '{$type}'!");
         }
       }
       $result[$change->getFilename()] = implode("\n", $lines);
     }
 
     return $result;
   }
 
   public function getHeraldField($field) {
     $data = $this->commitData;
     switch ($field) {
       case self::FIELD_BODY:
         return $data->getCommitMessage();
       case self::FIELD_AUTHOR:
         return $data->getCommitDetail('authorPHID');
       case self::FIELD_COMMITTER:
         return $data->getCommitDetail('committerPHID');
       case self::FIELD_REVIEWER:
         return $data->getCommitDetail('reviewerPHID');
       case self::FIELD_DIFF_FILE:
         return $this->loadAffectedPaths();
       case self::FIELD_REPOSITORY:
         return $this->repository->getPHID();
       case self::FIELD_REPOSITORY_PROJECTS:
         return $this->repository->getProjectPHIDs();
       case self::FIELD_DIFF_CONTENT:
         return $this->getDiffContent('*');
       case self::FIELD_DIFF_ADDED_CONTENT:
         return $this->getDiffContent('+');
       case self::FIELD_DIFF_REMOVED_CONTENT:
         return $this->getDiffContent('-');
       case self::FIELD_DIFF_ENORMOUS:
         $this->getDiffContent('*');
         return ($this->commitDiff instanceof Exception);
       case self::FIELD_AFFECTED_PACKAGE:
         $packages = $this->loadAffectedPackages();
         return mpull($packages, 'getPHID');
       case self::FIELD_AFFECTED_PACKAGE_OWNER:
         $packages = $this->loadAffectedPackages();
         $owners = PhabricatorOwnersOwner::loadAllForPackages($packages);
         return mpull($owners, 'getUserPHID');
       case self::FIELD_NEED_AUDIT_FOR_PACKAGE:
         return $this->loadAuditNeededPackage();
       case self::FIELD_DIFFERENTIAL_REVISION:
         $revision = $this->loadDifferentialRevision();
         if (!$revision) {
           return null;
         }
         return $revision->getID();
       case self::FIELD_DIFFERENTIAL_ACCEPTED:
         $revision = $this->loadDifferentialRevision();
         if (!$revision) {
           return null;
         }
 
         switch ($revision->getStatus()) {
           case ArcanistDifferentialRevisionStatus::ACCEPTED:
           case ArcanistDifferentialRevisionStatus::CLOSED:
             return $revision->getPHID();
         }
 
         return null;
       case self::FIELD_DIFFERENTIAL_REVIEWERS:
         $revision = $this->loadDifferentialRevision();
         if (!$revision) {
           return array();
         }
         return $revision->getReviewers();
       case self::FIELD_DIFFERENTIAL_CCS:
         $revision = $this->loadDifferentialRevision();
         if (!$revision) {
           return array();
         }
         return $revision->getCCPHIDs();
       case self::FIELD_BRANCHES:
         $params = array(
           'callsign' => $this->repository->getCallsign(),
           'contains' => $this->commit->getCommitIdentifier(),
         );
 
         $result = id(new ConduitCall('diffusion.branchquery', $params))
           ->setUser(PhabricatorUser::getOmnipotentUser())
           ->execute();
 
         $refs = DiffusionRepositoryRef::loadAllFromDictionaries($result);
         return mpull($refs, 'getShortName');
       case self::FIELD_REPOSITORY_AUTOCLOSE_BRANCH:
         return $this->repository->shouldAutocloseCommit(
           $this->commit,
           $this->commitData);
     }
 
     return parent::getHeraldField($field);
   }
 
   public function applyHeraldEffects(array $effects) {
     assert_instances_of($effects, 'HeraldEffect');
 
     $result = array();
     foreach ($effects as $effect) {
       $action = $effect->getAction();
       switch ($action) {
         case self::ACTION_NOTHING:
           $result[] = new HeraldApplyTranscript(
             $effect,
             true,
             pht('Great success at doing nothing.'));
           break;
         case self::ACTION_EMAIL:
           foreach ($effect->getTarget() as $phid) {
             $this->emailPHIDs[$phid] = true;
           }
           $result[] = new HeraldApplyTranscript(
             $effect,
             true,
             pht('Added address to email targets.'));
           break;
         case self::ACTION_ADD_CC:
           foreach ($effect->getTarget() as $phid) {
             if (empty($this->addCCPHIDs[$phid])) {
               $this->addCCPHIDs[$phid] = array();
             }
             $this->addCCPHIDs[$phid][] = $effect->getRuleID();
           }
           $result[] = new HeraldApplyTranscript(
             $effect,
             true,
             pht('Added address to CC.'));
           break;
         case self::ACTION_AUDIT:
           foreach ($effect->getTarget() as $phid) {
             if (empty($this->auditMap[$phid])) {
               $this->auditMap[$phid] = array();
             }
             $this->auditMap[$phid][] = $effect->getRuleID();
           }
           $result[] = new HeraldApplyTranscript(
             $effect,
             true,
             pht('Triggered an audit.'));
           break;
         case self::ACTION_APPLY_BUILD_PLANS:
           foreach ($effect->getTarget() as $phid) {
             $this->buildPlans[] = $phid;
           }
           $result[] = new HeraldApplyTranscript(
             $effect,
             true,
             pht('Applied build plans.'));
           break;
         case self::ACTION_FLAG:
           $result[] = parent::applyFlagEffect(
             $effect,
             $this->commit->getPHID());
           break;
         default:
           $custom_result = parent::handleCustomHeraldEffect($effect);
           if ($custom_result === null) {
             throw new Exception("No rules to handle action '{$action}'.");
           }
 
           $result[] = $custom_result;
           break;
       }
     }
     return $result;
   }
+
 }
diff --git a/src/applications/legalpad/config/PhabricatorLegalpadConfigOptions.php b/src/applications/legalpad/config/PhabricatorLegalpadConfigOptions.php
index 11f675eda5..76bf2bcca7 100644
--- a/src/applications/legalpad/config/PhabricatorLegalpadConfigOptions.php
+++ b/src/applications/legalpad/config/PhabricatorLegalpadConfigOptions.php
@@ -1,27 +1,24 @@
 <?php
 
-/**
- * @group legalpad
- */
 final class PhabricatorLegalpadConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
     return pht('Legalpad');
   }
 
   public function getDescription() {
     return pht('Configure Legalpad.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption(
         'metamta.legalpad.subject-prefix',
         'string',
         '[Legalpad]')
         ->setDescription(pht('Subject prefix for Legalpad email.'))
     );
   }
 
 }
diff --git a/src/applications/legalpad/constants/LegalpadConstants.php b/src/applications/legalpad/constants/LegalpadConstants.php
index 030a72de1d..c2f54b4f00 100644
--- a/src/applications/legalpad/constants/LegalpadConstants.php
+++ b/src/applications/legalpad/constants/LegalpadConstants.php
@@ -1,8 +1,3 @@
 <?php
 
-/**
- * @group legalpad
- */
-abstract class LegalpadConstants {
-
-}
+abstract class LegalpadConstants {}
diff --git a/src/applications/legalpad/controller/LegalpadController.php b/src/applications/legalpad/controller/LegalpadController.php
index a438bca36e..fbfb7038f4 100644
--- a/src/applications/legalpad/controller/LegalpadController.php
+++ b/src/applications/legalpad/controller/LegalpadController.php
@@ -1,32 +1,29 @@
 <?php
 
-/**
- * @group legalpad
- */
 abstract class LegalpadController extends PhabricatorController {
 
   public function buildSideNav($for_app = false) {
     $user = $this->getRequest()->getUser();
 
     $nav = new AphrontSideNavFilterView();
     $nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
 
     if ($for_app) {
       $nav->addFilter('create/', pht('Create Document'));
     }
 
     id(new LegalpadDocumentSearchEngine())
       ->setViewer($user)
       ->addNavigationItems($nav->getMenu());
 
     $nav->addLabel(pht('Signatures'));
     $nav->addFilter('signatures/', pht('Find Signatures'));
 
     return $nav;
   }
 
   public function buildApplicationMenu() {
     return $this->buildSideNav(true)->getMenu();
   }
 
 }
diff --git a/src/applications/legalpad/controller/LegalpadDocumentCommentController.php b/src/applications/legalpad/controller/LegalpadDocumentCommentController.php
index c5b5613b4f..823e150010 100644
--- a/src/applications/legalpad/controller/LegalpadDocumentCommentController.php
+++ b/src/applications/legalpad/controller/LegalpadDocumentCommentController.php
@@ -1,82 +1,79 @@
 <?php
 
-/**
- * @group legalpad
- */
 final class LegalpadDocumentCommentController extends LegalpadController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     if (!$request->isFormPost()) {
       return new Aphront400Response();
     }
 
     $document = id(new LegalpadDocumentQuery())
       ->setViewer($user)
       ->withIDs(array($this->id))
       ->needDocumentBodies(true)
       ->executeOne();
 
     if (!$document) {
       return new Aphront404Response();
     }
 
     $is_preview = $request->isPreviewRequest();
 
     $draft = PhabricatorDraft::buildFromRequest($request);
 
     $document_uri = $this->getApplicationURI('view/'.$document->getID());
 
     $comment = $request->getStr('comment');
 
     $xactions = array();
 
     if (strlen($comment)) {
       $xactions[] = id(new LegalpadTransaction())
         ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
         ->attachComment(
           id(new LegalpadTransactionComment())
             ->setDocumentID($document->getID())
             ->setLineNumber(0)
             ->setLineLength(0)
             ->setContent($comment));
     }
 
     $editor = id(new LegalpadDocumentEditor())
       ->setActor($user)
       ->setContentSourceFromRequest($request)
       ->setContinueOnNoEffect($request->isContinueRequest())
       ->setIsPreview($is_preview);
 
     try {
       $xactions = $editor->applyTransactions($document, $xactions);
     } catch (PhabricatorApplicationTransactionNoEffectException $ex) {
       return id(new PhabricatorApplicationTransactionNoEffectResponse())
         ->setCancelURI($document_uri)
         ->setException($ex);
     }
 
     if ($draft) {
       $draft->replaceOrDelete();
     }
 
     if ($request->isAjax() && $is_preview) {
       return id(new PhabricatorApplicationTransactionResponse())
         ->setViewer($user)
         ->setTransactions($xactions)
         ->setIsPreview($is_preview)
         ->setAnchorOffset($request->getStr('anchor'));
     } else {
       return id(new AphrontRedirectResponse())->setURI($document_uri);
     }
   }
 
 }
diff --git a/src/applications/legalpad/editor/LegalpadDocumentEditor.php b/src/applications/legalpad/editor/LegalpadDocumentEditor.php
index 909b72f3f0..c8904b0d42 100644
--- a/src/applications/legalpad/editor/LegalpadDocumentEditor.php
+++ b/src/applications/legalpad/editor/LegalpadDocumentEditor.php
@@ -1,215 +1,212 @@
 <?php
 
-/**
- * @group legalpad
- */
 final class LegalpadDocumentEditor
   extends PhabricatorApplicationTransactionEditor {
 
   private $isContribution = false;
 
   private function setIsContribution($is_contribution) {
     $this->isContribution = $is_contribution;
   }
 
   private function isContribution() {
     return $this->isContribution;
   }
 
   public function getTransactionTypes() {
     $types = parent::getTransactionTypes();
 
     $types[] = PhabricatorTransactions::TYPE_COMMENT;
     $types[] = PhabricatorTransactions::TYPE_VIEW_POLICY;
     $types[] = PhabricatorTransactions::TYPE_EDIT_POLICY;
 
     $types[] = LegalpadTransactionType::TYPE_TITLE;
     $types[] = LegalpadTransactionType::TYPE_TEXT;
     $types[] = LegalpadTransactionType::TYPE_SIGNATURE_TYPE;
     $types[] = LegalpadTransactionType::TYPE_PREAMBLE;
 
     return $types;
   }
 
   protected function getCustomTransactionOldValue(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case LegalpadTransactionType::TYPE_TITLE:
         return $object->getDocumentBody()->getTitle();
       case LegalpadTransactionType::TYPE_TEXT:
         return $object->getDocumentBody()->getText();
       case LegalpadTransactionType::TYPE_SIGNATURE_TYPE:
         return $object->getSignatureType();
       case LegalpadTransactionType::TYPE_PREAMBLE:
         return $object->getPreamble();
     }
   }
 
   protected function getCustomTransactionNewValue(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case LegalpadTransactionType::TYPE_TITLE:
       case LegalpadTransactionType::TYPE_TEXT:
       case LegalpadTransactionType::TYPE_SIGNATURE_TYPE:
       case LegalpadTransactionType::TYPE_PREAMBLE:
         return $xaction->getNewValue();
     }
   }
 
   protected function applyCustomInternalTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case LegalpadTransactionType::TYPE_TITLE:
         $object->setTitle($xaction->getNewValue());
         $body = $object->getDocumentBody();
         $body->setTitle($xaction->getNewValue());
         $this->setIsContribution(true);
         break;
       case LegalpadTransactionType::TYPE_TEXT:
         $body = $object->getDocumentBody();
         $body->setText($xaction->getNewValue());
         $this->setIsContribution(true);
         break;
       case LegalpadTransactionType::TYPE_SIGNATURE_TYPE:
         $object->setSignatureType($xaction->getNewValue());
         break;
       case LegalpadTransactionType::TYPE_PREAMBLE:
         $object->setPreamble($xaction->getNewValue());
         break;
     }
   }
 
   protected function applyCustomExternalTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
     return;
   }
 
   protected function applyFinalEffects(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     if ($this->isContribution()) {
       $object->setVersions($object->getVersions() + 1);
       $body = $object->getDocumentBody();
       $body->setVersion($object->getVersions());
       $body->setDocumentPHID($object->getPHID());
       $body->save();
 
       $object->setDocumentBodyPHID($body->getPHID());
 
       $actor = $this->getActor();
       $type = PhabricatorEdgeConfig::TYPE_CONTRIBUTED_TO_OBJECT;
       id(new PhabricatorEdgeEditor())
         ->addEdge($actor->getPHID(), $type, $object->getPHID())
         ->setActor($actor)
         ->save();
 
       $type = PhabricatorEdgeConfig::TYPE_OBJECT_HAS_CONTRIBUTOR;
       $contributors = PhabricatorEdgeQuery::loadDestinationPHIDs(
         $object->getPHID(),
         $type);
       $object->setRecentContributorPHIDs(array_slice($contributors, 0, 3));
       $object->setContributorCount(count($contributors));
 
       $object->save();
     }
 
     return $xactions;
   }
 
   protected function mergeTransactions(
     PhabricatorApplicationTransaction $u,
     PhabricatorApplicationTransaction $v) {
 
     $type = $u->getTransactionType();
     switch ($type) {
       case LegalpadTransactionType::TYPE_TITLE:
       case LegalpadTransactionType::TYPE_TEXT:
       case LegalpadTransactionType::TYPE_SIGNATURE_TYPE:
       case LegalpadTransactionType::TYPE_PREAMBLE:
         return $v;
     }
 
     return parent::mergeTransactions($u, $v);
   }
 
 /* -(  Sending Mail  )------------------------------------------------------- */
 
   protected function shouldSendMail(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return true;
   }
 
   protected function buildReplyHandler(PhabricatorLiskDAO $object) {
     return id(new LegalpadReplyHandler())
       ->setMailReceiver($object);
   }
 
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $id = $object->getID();
     $phid = $object->getPHID();
     $title = $object->getDocumentBody()->getTitle();
 
     return id(new PhabricatorMetaMTAMail())
       ->setSubject("L{$id}: {$title}")
       ->addHeader('Thread-Topic', "L{$id}: {$phid}");
   }
 
   protected function getMailTo(PhabricatorLiskDAO $object) {
     return array(
       $object->getCreatorPHID(),
       $this->requireActor()->getPHID(),
     );
   }
 
   protected function shouldImplyCC(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case LegalpadTransactionType::TYPE_TEXT:
       case LegalpadTransactionType::TYPE_TITLE:
       case LegalpadTransactionType::TYPE_PREAMBLE:
         return true;
     }
 
     return parent::shouldImplyCC($object, $xaction);
   }
 
   protected function buildMailBody(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $body = parent::buildMailBody($object, $xactions);
 
     $body->addTextSection(
       pht('DOCUMENT DETAIL'),
       PhabricatorEnv::getProductionURI('/legalpad/view/'.$object->getID().'/'));
 
     return $body;
   }
 
   protected function getMailSubjectPrefix() {
     return PhabricatorEnv::getEnvConfig('metamta.legalpad.subject-prefix');
   }
 
 
   protected function shouldPublishFeedStory(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return false;
   }
 
   protected function supportsSearch() {
     return false;
   }
 
 }
diff --git a/src/applications/legalpad/mail/LegalpadReplyHandler.php b/src/applications/legalpad/mail/LegalpadReplyHandler.php
index 7491dcb86d..006b3efd80 100644
--- a/src/applications/legalpad/mail/LegalpadReplyHandler.php
+++ b/src/applications/legalpad/mail/LegalpadReplyHandler.php
@@ -1,89 +1,86 @@
 <?php
 
-/**
- * @group legalpad
- */
 final class LegalpadReplyHandler extends PhabricatorMailReplyHandler {
 
   public function validateMailReceiver($mail_receiver) {
     if (!($mail_receiver instanceof LegalpadDocument)) {
       throw new Exception('Mail receiver is not a LegalpadDocument!');
     }
   }
 
   public function getPrivateReplyHandlerEmailAddress(
     PhabricatorObjectHandle $handle) {
     return $this->getDefaultPrivateReplyHandlerEmailAddress($handle, 'L');
   }
 
   public function getPublicReplyHandlerEmailAddress() {
     return $this->getDefaultPublicReplyHandlerEmailAddress('L');
   }
 
   public function getReplyHandlerDomain() {
     return PhabricatorEnv::getEnvConfig(
       'metamta.reply-handler-domain');
   }
 
   public function getReplyHandlerInstructions() {
     if ($this->supportsReplies()) {
       return pht('Reply to comment or !unsubscribe.');
     } else {
       return null;
     }
   }
 
   protected function receiveEmail(PhabricatorMetaMTAReceivedMail $mail) {
     $actor = $this->getActor();
     $document = $this->getMailReceiver();
 
     $body_data = $mail->parseBody();
     $body = $body_data['body'];
     $body = $this->enhanceBodyWithAttachments($body, $mail->getAttachments());
 
     $content_source = PhabricatorContentSource::newForSource(
       PhabricatorContentSource::SOURCE_EMAIL,
       array(
         'id' => $mail->getID(),
       ));
 
 
     $xactions = array();
     $command = $body_data['command'];
 
     switch ($command) {
       case 'unsubscribe':
         $xaction = id(new LegalpadTransaction())
           ->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS)
           ->setNewValue(array('-' => array($actor->getPHID())));
         $xactions[] = $xaction;
         break;
     }
 
     $xactions[] = id(new LegalpadTransaction())
       ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
       ->attachComment(
         id(new LegalpadTransactionComment())
         ->setDocumentID($document->getID())
         ->setLineNumber(0)
         ->setLineLength(0)
         ->setContent($body));
 
     $editor = id(new LegalpadDocumentEditor())
       ->setActor($actor)
       ->setContentSource($content_source)
       ->setContinueOnNoEffect(true)
       ->setIsPreview(false);
 
     try {
       $xactions = $editor->applyTransactions($document, $xactions);
     } catch (PhabricatorApplicationTransactionNoEffectException $ex) {
       // just do nothing, though unclear why you're sending a blank email
       return true;
     }
 
     $head_xaction = head($xactions);
     return $head_xaction->getID();
   }
 
 }
diff --git a/src/applications/legalpad/phid/PhabricatorLegalpadPHIDTypeDocument.php b/src/applications/legalpad/phid/PhabricatorLegalpadPHIDTypeDocument.php
index 3640181407..c854392875 100644
--- a/src/applications/legalpad/phid/PhabricatorLegalpadPHIDTypeDocument.php
+++ b/src/applications/legalpad/phid/PhabricatorLegalpadPHIDTypeDocument.php
@@ -1,74 +1,71 @@
 <?php
 
-/**
- * @group legalpad
- */
 final class PhabricatorLegalpadPHIDTypeDocument extends PhabricatorPHIDType {
 
   const TYPECONST = 'LEGD';
 
   public function getTypeConstant() {
     return self::TYPECONST;
   }
 
   public function getTypeName() {
     return pht('Legalpad Document');
   }
 
   public function newObject() {
     return new LegalpadDocument();
   }
 
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new LegalpadDocumentQuery())
       ->withPHIDs($phids)
       ->needDocumentBodies(true);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $document = $objects[$phid];
       $name = $document->getDocumentBody()->getTitle();
       $handle->setName($name);
       $handle->setFullName($document->getMonogram().' '.$name);
       $handle->setURI('/'.$document->getMonogram());
     }
   }
 
   public function canLoadNamedObject($name) {
     return preg_match('/^L\d*[1-9]\d*$/i', $name);
   }
 
   public function loadNamedObjects(
     PhabricatorObjectQuery $query,
     array $names) {
 
     $id_map = array();
     foreach ($names as $name) {
       $id = (int)substr($name, 1);
       $id_map[$id][] = $name;
     }
 
     $objects = id(new LegalpadDocumentQuery())
       ->setViewer($query->getViewer())
       ->withIDs(array_keys($id_map))
       ->execute();
 
     $results = array();
     foreach ($objects as $id => $object) {
       foreach (idx($id_map, $id, array()) as $name) {
         $results[$name] = $object;
       }
     }
 
     return $results;
   }
 
 }
diff --git a/src/applications/legalpad/query/LegalpadTransactionQuery.php b/src/applications/legalpad/query/LegalpadTransactionQuery.php
index f76bd9f376..e4234d16a7 100644
--- a/src/applications/legalpad/query/LegalpadTransactionQuery.php
+++ b/src/applications/legalpad/query/LegalpadTransactionQuery.php
@@ -1,13 +1,10 @@
 <?php
 
-/**
- * @group legalpad
- */
 final class LegalpadTransactionQuery
   extends PhabricatorApplicationTransactionQuery {
 
   public function getTemplateApplicationTransaction() {
     return new LegalpadTransaction();
   }
 
 }
diff --git a/src/applications/legalpad/storage/LegalpadDAO.php b/src/applications/legalpad/storage/LegalpadDAO.php
index 86079fe57d..d0d6387f81 100644
--- a/src/applications/legalpad/storage/LegalpadDAO.php
+++ b/src/applications/legalpad/storage/LegalpadDAO.php
@@ -1,12 +1,9 @@
 <?php
 
-/**
- * @group legalpad
- */
 abstract class LegalpadDAO extends PhabricatorLiskDAO {
 
   public function getApplicationName() {
     return 'legalpad';
   }
 
 }
diff --git a/src/applications/legalpad/storage/LegalpadDocumentBody.php b/src/applications/legalpad/storage/LegalpadDocumentBody.php
index 7c658595c4..49171ee382 100644
--- a/src/applications/legalpad/storage/LegalpadDocumentBody.php
+++ b/src/applications/legalpad/storage/LegalpadDocumentBody.php
@@ -1,73 +1,69 @@
 <?php
 
-/**
- * @group legalpad
- */
 final class LegalpadDocumentBody extends LegalpadDAO
   implements
     PhabricatorMarkupInterface {
 
   const MARKUP_FIELD_TEXT = 'markup:text ';
 
   protected $phid;
   protected $creatorPHID;
   protected $documentPHID;
   protected $version;
   protected $title;
   protected $text;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
       PhabricatorPHIDConstants::PHID_TYPE_LEGB);
   }
 
 /* -(  PhabricatorMarkupInterface  )----------------------------------------- */
 
 
   public function getMarkupFieldKey($field) {
     $hash = PhabricatorHash::digest($this->getMarkupText($field));
     return 'LEGB:'.$hash;
   }
 
   public function newMarkupEngine($field) {
     return PhabricatorMarkupEngine::newMarkupEngine(array());
   }
 
   public function getMarkupText($field) {
     switch ($field) {
       case self::MARKUP_FIELD_TEXT:
         $text = $this->getText();
         break;
       case self::MARKUP_FIELD_TITLE:
         $text = $this->getTitle();
         break;
       default:
         throw new Exception('Unknown field: '.$field);
         break;
     }
 
     return $text;
   }
 
   public function didMarkupText($field, $output, PhutilMarkupEngine $engine) {
     require_celerity_resource('phabricator-remarkup-css');
     return phutil_tag(
       'div',
       array(
         'class' => 'phabricator-remarkup',
       ),
       $output);
   }
 
   public function shouldUseMarkupCache($field) {
     return (bool)$this->getID();
   }
 
-
 }
diff --git a/src/applications/legalpad/storage/LegalpadTransaction.php b/src/applications/legalpad/storage/LegalpadTransaction.php
index 164e9e31dc..1cd4a1dcb0 100644
--- a/src/applications/legalpad/storage/LegalpadTransaction.php
+++ b/src/applications/legalpad/storage/LegalpadTransaction.php
@@ -1,82 +1,79 @@
 <?php
 
-/**
- * @group legalpad
- */
 final class LegalpadTransaction extends PhabricatorApplicationTransaction {
 
   public function getApplicationName() {
     return 'legalpad';
   }
 
   public function getApplicationTransactionType() {
     return PhabricatorLegalpadPHIDTypeDocument::TYPECONST;
   }
 
   public function getApplicationTransactionCommentObject() {
     return new LegalpadTransactionComment();
   }
 
   public function getApplicationTransactionViewObject() {
     return new LegalpadTransactionView();
   }
 
   public function shouldHide() {
     $old = $this->getOldValue();
 
     switch ($this->getTransactionType()) {
       case LegalpadTransactionType::TYPE_TITLE:
       case LegalpadTransactionType::TYPE_TEXT:
         return ($old === null);
       case LegalpadTransactionType::TYPE_SIGNATURE_TYPE:
         return true;
     }
 
     return parent::shouldHide();
   }
 
   public function getTitle() {
     $author_phid = $this->getAuthorPHID();
 
     $old = $this->getOldValue();
     $new = $this->getNewValue();
 
     $type = $this->getTransactionType();
     switch ($type) {
       case LegalpadTransactionType::TYPE_TITLE:
         return pht(
           '%s renamed this document from "%s" to "%s".',
           $this->renderHandleLink($author_phid),
           $old,
           $new);
       case LegalpadTransactionType::TYPE_TEXT:
         return pht(
           "%s updated the document's text.",
           $this->renderHandleLink($author_phid));
       case LegalpadTransactionType::TYPE_PREAMBLE:
         return pht(
           '%s updated the preamble.',
           $this->renderHandleLink($author_phid));
     }
 
     return parent::getTitle();
   }
 
   public function hasChangeDetails() {
     switch ($this->getTransactionType()) {
       case LegalpadTransactionType::TYPE_TITLE:
       case LegalpadTransactionType::TYPE_TEXT:
       case LegalpadTransactionType::TYPE_PREAMBLE:
         return true;
     }
     return parent::hasChangeDetails();
   }
 
   public function renderChangeDetails(PhabricatorUser $viewer) {
     return $this->renderTextCorpusChangeDetails(
       $viewer,
       $this->getOldValue(),
       $this->getNewValue());
   }
 
 }
diff --git a/src/applications/legalpad/storage/LegalpadTransactionComment.php b/src/applications/legalpad/storage/LegalpadTransactionComment.php
index a5e78f8735..563820406e 100644
--- a/src/applications/legalpad/storage/LegalpadTransactionComment.php
+++ b/src/applications/legalpad/storage/LegalpadTransactionComment.php
@@ -1,24 +1,22 @@
 <?php
 
-/**
- * @group legalpad
- */
 final class LegalpadTransactionComment
   extends PhabricatorApplicationTransactionComment {
 
   protected $documentID;
   protected $lineNumber;
   protected $lineLength;
   protected $fixedState;
   protected $hasReplies = 0;
   protected $replyToCommentPHID;
 
   public function getApplicationTransactionObject() {
     return new LegalpadTransaction();
   }
 
   public function shouldUseMarkupCache($field) {
     // Only cache submitted comments.
     return ($this->getTransactionPHID() != null);
   }
+
 }
diff --git a/src/applications/legalpad/view/LegalpadTransactionView.php b/src/applications/legalpad/view/LegalpadTransactionView.php
index 73d2418939..a68619c000 100644
--- a/src/applications/legalpad/view/LegalpadTransactionView.php
+++ b/src/applications/legalpad/view/LegalpadTransactionView.php
@@ -1,9 +1,4 @@
 <?php
 
-/**
- * @group legalpad
- */
 final class LegalpadTransactionView
-  extends PhabricatorApplicationTransactionView {
-
-}
+  extends PhabricatorApplicationTransactionView {}
diff --git a/src/applications/macro/conduit/ConduitAPI_macro_Method.php b/src/applications/macro/conduit/ConduitAPI_macro_Method.php
index d3cb77c122..df48df3426 100644
--- a/src/applications/macro/conduit/ConduitAPI_macro_Method.php
+++ b/src/applications/macro/conduit/ConduitAPI_macro_Method.php
@@ -1,14 +1,10 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class ConduitAPI_macro_Method extends ConduitAPIMethod {
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
       'PhabricatorApplicationMacro');
   }
 
-
 }
diff --git a/src/applications/macro/conduit/ConduitAPI_macro_creatememe_Method.php b/src/applications/macro/conduit/ConduitAPI_macro_creatememe_Method.php
index 04f10fd31b..d0d7e9295c 100644
--- a/src/applications/macro/conduit/ConduitAPI_macro_creatememe_Method.php
+++ b/src/applications/macro/conduit/ConduitAPI_macro_creatememe_Method.php
@@ -1,57 +1,53 @@
 <?php
 
-/**
- * @group conduit
- */
-final class ConduitAPI_macro_creatememe_Method
-  extends ConduitAPI_macro_Method {
+final class ConduitAPI_macro_creatememe_Method extends ConduitAPI_macro_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
     return pht('Generate a meme.');
   }
 
   public function defineParamTypes() {
     return array(
       'macroName'    => 'string',
       'upperText'    => 'optional string',
       'lowerText'    => 'optional string',
     );
   }
 
   public function defineReturnType() {
     return 'string';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-NOT-FOUND' => 'Macro was not found.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $user = $request->getUser();
 
     $macro_name = $request->getValue('macroName');
     $upper_text = $request->getValue('upperText');
     $lower_text = $request->getValue('lowerText');
 
     $uri = PhabricatorMacroMemeController::generateMacro(
       $user,
       $macro_name,
       $upper_text,
       $lower_text);
 
     if (!$uri) {
       throw new ConduitException('ERR-NOT-FOUND');
     }
 
     return array(
       'uri' => $uri,
     );
   }
 
 }
diff --git a/src/applications/macro/conduit/ConduitAPI_macro_query_Method.php b/src/applications/macro/conduit/ConduitAPI_macro_query_Method.php
index b5f76ddc80..fcdd0ffdd8 100644
--- a/src/applications/macro/conduit/ConduitAPI_macro_query_Method.php
+++ b/src/applications/macro/conduit/ConduitAPI_macro_query_Method.php
@@ -1,81 +1,78 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_macro_query_Method extends ConduitAPI_macro_Method {
 
   public function getMethodDescription() {
     return 'Retrieve image macro information.';
   }
 
   public function defineParamTypes() {
     return array(
       'authorPHIDs' => 'optional list<phid>',
       'phids'       => 'optional list<phid>',
       'ids'         => 'optional list<id>',
       'names'       => 'optional list<string>',
       'nameLike'    => 'optional string',
     );
   }
 
   public function defineReturnType() {
     return 'list<dict>';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $query = new PhabricatorMacroQuery();
     $query->setViewer($request->getUser());
 
     $author_phids = $request->getValue('authorPHIDs');
     $phids = $request->getValue('phids');
     $ids = $request->getValue('ids');
     $name_like = $request->getValue('nameLike');
     $names = $request->getValue('names');
 
     if ($author_phids) {
       $query->withAuthorPHIDs($author_phids);
     }
 
     if ($phids) {
       $query->withPHIDs($phids);
     }
 
     if ($ids) {
       $query->withIDs($ids);
     }
 
     if ($name_like) {
       $query->withNameLike($name_like);
     }
 
     if ($names) {
       $query->withNames($names);
     }
 
     $macros = $query->execute();
 
     if (!$macros) {
       return array();
     }
 
     $results = array();
     foreach ($macros as $macro) {
       $file = $macro->getFile();
       $results[$macro->getName()] = array(
         'uri' => $file->getBestURI(),
         'phid' => $macro->getPHID(),
         'authorPHID' => $file->getAuthorPHID(),
         'dateCreated'   => $file->getDateCreated(),
       );
     }
 
     return $results;
   }
 
 }
diff --git a/src/applications/macro/query/PhabricatorMacroQuery.php b/src/applications/macro/query/PhabricatorMacroQuery.php
index 4723b5fe20..7a38db48d5 100644
--- a/src/applications/macro/query/PhabricatorMacroQuery.php
+++ b/src/applications/macro/query/PhabricatorMacroQuery.php
@@ -1,231 +1,227 @@
 <?php
 
-/**
- * @group phriction
- */
 final class PhabricatorMacroQuery
   extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $ids;
   private $phids;
   private $authors;
   private $names;
   private $nameLike;
   private $dateCreatedAfter;
   private $dateCreatedBefore;
   private $flagColor;
 
   private $status = 'status-any';
   const STATUS_ANY = 'status-any';
   const STATUS_ACTIVE = 'status-active';
   const STATUS_DISABLED = 'status-disabled';
 
   public static function getStatusOptions() {
     return array(
       self::STATUS_ACTIVE   => pht('Active Macros'),
       self::STATUS_DISABLED => pht('Disabled Macros'),
       self::STATUS_ANY      => pht('Active and Disabled Macros'),
     );
   }
 
   public static function getFlagColorsOptions() {
-
     $options = array(
       '-1' => pht('(No Filtering)'),
       '-2' => pht('(Marked With Any Flag)'),
     );
 
     foreach (PhabricatorFlagColor::getColorNameMap() as $color => $name) {
       $options[$color] = $name;
     }
 
     return $options;
   }
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
     return $this;
   }
 
   public function withPHIDs(array $phids) {
     $this->phids = $phids;
     return $this;
   }
 
   public function withAuthorPHIDs(array $authors) {
     $this->authors = $authors;
     return $this;
   }
 
   public function withNameLike($name) {
     $this->nameLike = $name;
     return $this;
   }
 
   public function withNames(array $names) {
     $this->names = $names;
     return $this;
   }
 
   public function withStatus($status) {
     $this->status = $status;
     return $this;
   }
 
   public function withDateCreatedBefore($date_created_before) {
     $this->dateCreatedBefore = $date_created_before;
     return $this;
   }
 
   public function withDateCreatedAfter($date_created_after) {
     $this->dateCreatedAfter = $date_created_after;
     return $this;
   }
 
   public function withFlagColor($flag_color) {
     $this->flagColor = $flag_color;
     return $this;
   }
 
   protected function loadPage() {
     $macro_table = new PhabricatorFileImageMacro();
     $conn = $macro_table->establishConnection('r');
 
     $rows = queryfx_all(
       $conn,
       'SELECT m.* FROM %T m %Q %Q %Q',
       $macro_table->getTableName(),
       $this->buildWhereClause($conn),
       $this->buildOrderClause($conn),
       $this->buildLimitClause($conn));
 
     return $macro_table->loadAllFromArray($rows);
   }
 
   protected function buildWhereClause(AphrontDatabaseConnection $conn) {
     $where = array();
 
     if ($this->ids) {
       $where[] = qsprintf(
         $conn,
         'm.id IN (%Ld)',
         $this->ids);
     }
 
     if ($this->phids) {
       $where[] = qsprintf(
         $conn,
         'm.phid IN (%Ls)',
         $this->phids);
     }
 
     if ($this->authors) {
       $where[] = qsprintf(
         $conn,
         'm.authorPHID IN (%Ls)',
         $this->authors);
     }
 
     if ($this->nameLike) {
       $where[] = qsprintf(
         $conn,
         'm.name LIKE %~',
         $this->nameLike);
     }
 
     if ($this->names) {
       $where[] = qsprintf(
         $conn,
         'm.name IN (%Ls)',
         $this->names);
     }
 
     switch ($this->status) {
       case self::STATUS_ACTIVE:
         $where[] = qsprintf(
           $conn,
           'm.isDisabled = 0');
         break;
       case self::STATUS_DISABLED:
         $where[] = qsprintf(
           $conn,
           'm.isDisabled = 1');
         break;
       case self::STATUS_ANY:
         break;
       default:
         throw new Exception("Unknown status '{$this->status}'!");
     }
 
     if ($this->dateCreatedAfter) {
       $where[] = qsprintf(
         $conn,
         'm.dateCreated >= %d',
         $this->dateCreatedAfter);
     }
 
     if ($this->dateCreatedBefore) {
       $where[] = qsprintf(
         $conn,
         'm.dateCreated <= %d',
         $this->dateCreatedBefore);
     }
 
     if ($this->flagColor != '-1' && $this->flagColor !== null) {
       if ($this->flagColor == '-2') {
         $flag_colors = array_keys(PhabricatorFlagColor::getColorNameMap());
       } else {
         $flag_colors = array($this->flagColor);
       }
       $flags = id(new PhabricatorFlagQuery())
         ->withOwnerPHIDs(array($this->getViewer()->getPHID()))
         ->withTypes(array(PhabricatorMacroPHIDTypeMacro::TYPECONST))
         ->withColors($flag_colors)
         ->setViewer($this->getViewer())
         ->execute();
 
       if (empty($flags)) {
         throw new PhabricatorEmptyQueryException('No matching flags.');
       } else {
         $where[] = qsprintf(
           $conn,
           'm.phid IN (%Ls)',
           mpull($flags, 'getObjectPHID'));
       }
     }
 
     $where[] = $this->buildPagingClause($conn);
 
     return $this->formatWhereClause($where);
   }
 
   protected function didFilterPage(array $macros) {
     $file_phids = mpull($macros, 'getFilePHID');
     $files = id(new PhabricatorFileQuery())
       ->setViewer($this->getViewer())
       ->setParentQuery($this)
       ->withPHIDs($file_phids)
       ->execute();
     $files = mpull($files, null, 'getPHID');
 
     foreach ($macros as $key => $macro) {
       $file = idx($files, $macro->getFilePHID());
       if (!$file) {
         unset($macros[$key]);
         continue;
       }
       $macro->attachFile($file);
     }
 
     return $macros;
   }
 
   protected function getPagingColumn() {
     return 'm.id';
   }
 
   public function getQueryApplicationClass() {
     return 'PhabricatorApplicationMacro';
   }
 
 }
diff --git a/src/applications/macro/remarkup/PhabricatorRemarkupRuleImageMacro.php b/src/applications/macro/remarkup/PhabricatorRemarkupRuleImageMacro.php
index 1c9ba594d6..4a0ddae147 100644
--- a/src/applications/macro/remarkup/PhabricatorRemarkupRuleImageMacro.php
+++ b/src/applications/macro/remarkup/PhabricatorRemarkupRuleImageMacro.php
@@ -1,166 +1,162 @@
 <?php
 
-/**
- * @group markup
- */
-final class PhabricatorRemarkupRuleImageMacro
-  extends PhutilRemarkupRule {
+final class PhabricatorRemarkupRuleImageMacro extends PhutilRemarkupRule {
 
   private $macros;
 
   const KEY_RULE_MACRO = 'rule.macro';
 
   public function apply($text) {
     return preg_replace_callback(
       '@^\s*([a-zA-Z0-9:_\-]+)$@m',
       array($this, 'markupImageMacro'),
       $text);
   }
 
   public function markupImageMacro($matches) {
     if ($this->macros === null) {
       $this->macros = array();
 
       $viewer = $this->getEngine()->getConfig('viewer');
       $rows = id(new PhabricatorMacroQuery())
         ->setViewer($viewer)
         ->withStatus(PhabricatorMacroQuery::STATUS_ACTIVE)
         ->execute();
 
       $this->macros = mpull($rows, 'getPHID', 'getName');
     }
 
     $name = (string)$matches[1];
     if (empty($this->macros[$name])) {
       return $matches[1];
     }
 
     $engine = $this->getEngine();
 
 
     $metadata_key = self::KEY_RULE_MACRO;
     $metadata = $engine->getTextMetadata($metadata_key, array());
 
     $token = $engine->storeText('<macro>');
     $metadata[] = array(
       'token' => $token,
       'phid' => $this->macros[$name],
       'original' => $name,
     );
 
     $engine->setTextMetadata($metadata_key, $metadata);
 
     return $token;
   }
 
   public function didMarkupText() {
     $engine = $this->getEngine();
     $metadata_key = self::KEY_RULE_MACRO;
     $metadata = $engine->getTextMetadata($metadata_key, array());
 
     if (!$metadata) {
       return;
     }
 
     $phids = ipull($metadata, 'phid');
     $viewer = $this->getEngine()->getConfig('viewer');
 
     // Load all the macros.
     $macros = id(new PhabricatorMacroQuery())
       ->setViewer($viewer)
       ->withStatus(PhabricatorMacroQuery::STATUS_ACTIVE)
       ->withPHIDs($phids)
       ->execute();
     $macros = mpull($macros, null, 'getPHID');
 
     // Load all the images and audio.
     $file_phids = array_merge(
       array_values(mpull($macros, 'getFilePHID')),
       array_values(mpull($macros, 'getAudioPHID')));
 
     $file_phids = array_filter($file_phids);
 
     $files = array();
     if ($file_phids) {
       $files = id(new PhabricatorFileQuery())
         ->setViewer($viewer)
         ->withPHIDs($file_phids)
         ->execute();
       $files = mpull($files, null, 'getPHID');
     }
 
     // Replace any macros that we couldn't load the macro or image for with
     // the original text.
     foreach ($metadata as $key => $spec) {
       $macro = idx($macros, $spec['phid']);
       if ($macro) {
         $file = idx($files, $macro->getFilePHID());
         if ($file) {
           continue;
         }
       }
 
       $engine->overwriteStoredText($spec['token'], $spec['original']);
       unset($metadata[$key]);
     }
 
     foreach ($metadata as $spec) {
       $macro = $macros[$spec['phid']];
       $file = $files[$macro->getFilePHID()];
       $src_uri = $file->getBestURI();
 
       if ($this->getEngine()->isTextMode()) {
         $result = $spec['original'].' <'.$src_uri.'>';
         $engine->overwriteStoredText($spec['token'], $result);
         continue;
       }
 
       $file_data = $file->getMetadata();
       $style = null;
       $height = idx($file_data, PhabricatorFile::METADATA_IMAGE_HEIGHT);
       $width = idx($file_data, PhabricatorFile::METADATA_IMAGE_WIDTH);
       if ($height && $width) {
         $style = sprintf(
           'height: %dpx; width: %dpx;',
           $height,
           $width);
       }
 
       $id = null;
       $audio = idx($files, $macro->getAudioPHID());
       if ($audio) {
         $id = celerity_generate_unique_node_id();
 
         $loop = null;
         switch ($macro->getAudioBehavior()) {
           case PhabricatorFileImageMacro::AUDIO_BEHAVIOR_LOOP:
             $loop = true;
             break;
         }
 
         Javelin::initBehavior(
           'audio-source',
           array(
             'sourceID' => $id,
             'audioURI' => $audio->getBestURI(),
             'loop' => $loop,
           ));
       }
 
       $result = $this->newTag(
         'img',
         array(
           'id'    => $id,
           'src'   => $src_uri,
           'alt'   => $spec['original'],
           'title' => $spec['original'],
           'style' => $style,
         ));
 
       $engine->overwriteStoredText($spec['token'], $result);
     }
 
     $engine->setTextMetadata($metadata_key, array());
   }
 
 }
diff --git a/src/applications/macro/remarkup/PhabricatorRemarkupRuleMeme.php b/src/applications/macro/remarkup/PhabricatorRemarkupRuleMeme.php
index 7deed4a6c8..09aaf81cb4 100644
--- a/src/applications/macro/remarkup/PhabricatorRemarkupRuleMeme.php
+++ b/src/applications/macro/remarkup/PhabricatorRemarkupRuleMeme.php
@@ -1,64 +1,60 @@
 <?php
 
-/**
- * @group markup
- */
-final class PhabricatorRemarkupRuleMeme
-  extends PhutilRemarkupRule {
+final class PhabricatorRemarkupRuleMeme extends PhutilRemarkupRule {
 
   private $images;
 
   public function getPriority() {
     return 200.0;
   }
 
   public function apply($text) {
     return preg_replace_callback(
       '@{meme,((?:[^}\\\\]+|\\\\.)+)}$@m',
       array($this, 'markupMeme'),
       $text);
   }
 
   public function markupMeme($matches) {
     if (!$this->isFlatText($matches[0])) {
       return $matches[0];
     }
 
     $options = array(
       'src' => null,
       'above' => null,
       'below' => null,
     );
 
     $parser = new PhutilSimpleOptions();
     $options = $parser->parse($matches[1]) + $options;
 
     $uri = id(new PhutilURI('/macro/meme/'))
       ->alter('macro', $options['src'])
       ->alter('uppertext', $options['above'])
       ->alter('lowertext', $options['below']);
 
     if ($this->getEngine()->isTextMode()) {
       $img =
         ($options['above'] != '' ? "\"{$options['above']}\"\n" : '').
         $options['src'].' <'.PhabricatorEnv::getProductionURI($uri).'>'.
         ($options['below'] != '' ? "\n\"{$options['below']}\"" : '');
     } else {
       $alt_text = pht(
         'Macro %s: %s %s',
         $options['src'],
         $options['above'],
         $options['below']);
 
       $img = $this->newTag(
         'img',
         array(
           'src' => $uri,
           'alt' => $alt_text,
         ));
     }
 
     return $this->getEngine()->storeText($img);
   }
 
 }
diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_Method.php b/src/applications/maniphest/conduit/ConduitAPI_maniphest_Method.php
index 5f49aa3a76..b2dd625bfc 100644
--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_Method.php
+++ b/src/applications/maniphest/conduit/ConduitAPI_maniphest_Method.php
@@ -1,292 +1,291 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class ConduitAPI_maniphest_Method extends ConduitAPIMethod {
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
       'PhabricatorApplicationManiphest');
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-INVALID-PARAMETER' => 'Missing or malformed parameter.'
     );
   }
 
   protected function buildTaskInfoDictionary(ManiphestTask $task) {
     $results = $this->buildTaskInfoDictionaries(array($task));
     return idx($results, $task->getPHID());
   }
 
   protected function getTaskFields($is_new) {
     $fields = array();
 
     if (!$is_new) {
       $fields += array(
         'id'        => 'optional int',
         'phid'      => 'optional int',
       );
     }
 
     $fields += array(
       'title'         => $is_new ? 'required string' : 'optional string',
       'description'   => 'optional string',
       'ownerPHID'     => 'optional phid',
       'ccPHIDs'       => 'optional list<phid>',
       'priority'      => 'optional int',
       'projectPHIDs'  => 'optional list<phid>',
       'auxiliary'     => 'optional dict',
     );
 
     if (!$is_new) {
       $fields += array(
         'status'    => 'optional int',
         'comments'  => 'optional string',
       );
     }
 
     return $fields;
   }
 
   protected function applyRequest(
     ManiphestTask $task,
     ConduitAPIRequest $request,
     $is_new) {
 
     $changes = array();
 
     if ($is_new) {
       $task->setTitle((string)$request->getValue('title'));
       $task->setDescription((string)$request->getValue('description'));
       $changes[ManiphestTransaction::TYPE_STATUS] =
         ManiphestTaskStatus::getDefaultStatus();
     } else {
 
       $comments = $request->getValue('comments');
       if (!$is_new && $comments !== null) {
         $changes[PhabricatorTransactions::TYPE_COMMENT] = null;
       }
 
       $title = $request->getValue('title');
       if ($title !== null) {
         $changes[ManiphestTransaction::TYPE_TITLE] = $title;
       }
 
       $desc = $request->getValue('description');
       if ($desc !== null) {
         $changes[ManiphestTransaction::TYPE_DESCRIPTION] = $desc;
       }
 
       $status = $request->getValue('status');
       if ($status !== null) {
         $valid_statuses = ManiphestTaskStatus::getTaskStatusMap();
         if (!isset($valid_statuses[$status])) {
           throw id(new ConduitException('ERR-INVALID-PARAMETER'))
             ->setErrorDescription('Status set to invalid value.');
         }
         $changes[ManiphestTransaction::TYPE_STATUS] = $status;
       }
     }
 
     $priority = $request->getValue('priority');
     if ($priority !== null) {
       $valid_priorities = ManiphestTaskPriority::getTaskPriorityMap();
       if (!isset($valid_priorities[$priority])) {
         throw id(new ConduitException('ERR-INVALID-PARAMETER'))
           ->setErrorDescription('Priority set to invalid value.');
       }
       $changes[ManiphestTransaction::TYPE_PRIORITY] = $priority;
     }
 
     $owner_phid = $request->getValue('ownerPHID');
     if ($owner_phid !== null) {
-      $this->validatePHIDList(array($owner_phid),
-                              PhabricatorPeoplePHIDTypeUser::TYPECONST,
-                              'ownerPHID');
+      $this->validatePHIDList(
+        array($owner_phid),
+        PhabricatorPeoplePHIDTypeUser::TYPECONST,
+        'ownerPHID');
       $changes[ManiphestTransaction::TYPE_OWNER] = $owner_phid;
     }
 
     $ccs = $request->getValue('ccPHIDs');
     if ($ccs !== null) {
-      $this->validatePHIDList($ccs,
-                              PhabricatorPeoplePHIDTypeUser::TYPECONST,
-                              'ccPHIDS');
+      $this->validatePHIDList(
+        $ccs,
+        PhabricatorPeoplePHIDTypeUser::TYPECONST,
+        'ccPHIDS');
       $changes[ManiphestTransaction::TYPE_CCS] = $ccs;
     }
 
     $project_phids = $request->getValue('projectPHIDs');
     if ($project_phids !== null) {
-      $this->validatePHIDList($project_phids,
-                              PhabricatorProjectPHIDTypeProject::TYPECONST,
-                              'projectPHIDS');
+      $this->validatePHIDList(
+        $project_phids,
+        PhabricatorProjectPHIDTypeProject::TYPECONST,
+        'projectPHIDS');
       $changes[ManiphestTransaction::TYPE_PROJECTS] = $project_phids;
     }
 
     $template = new ManiphestTransaction();
 
     $transactions = array();
     foreach ($changes as $type => $value) {
       $transaction = clone $template;
       $transaction->setTransactionType($type);
       if ($type == PhabricatorTransactions::TYPE_COMMENT) {
         $transaction->attachComment(
           id(new ManiphestTransactionComment())
             ->setContent($comments));
       } else {
         $transaction->setNewValue($value);
       }
 
       $transactions[] = $transaction;
     }
 
     $field_list = PhabricatorCustomField::getObjectFields(
       $task,
       PhabricatorCustomField::ROLE_EDIT);
     $field_list->readFieldsFromStorage($task);
 
     $auxiliary = $request->getValue('auxiliary');
     if ($auxiliary) {
       foreach ($field_list->getFields() as $key => $field) {
         if (!array_key_exists($key, $auxiliary)) {
           continue;
         }
         $transaction = clone $template;
         $transaction->setTransactionType(
           PhabricatorTransactions::TYPE_CUSTOMFIELD);
         $transaction->setMetadataValue('customfield:key', $key);
         $transaction->setOldValue(
           $field->getOldValueForApplicationTransactions());
         $transaction->setNewValue($auxiliary[$key]);
         $transactions[] = $transaction;
       }
     }
 
     if (!$transactions) {
       return;
     }
 
     $event = new PhabricatorEvent(
       PhabricatorEventType::TYPE_MANIPHEST_WILLEDITTASK,
       array(
         'task'          => $task,
         'new'           => $is_new,
         'transactions'  => $transactions,
       ));
     $event->setUser($request->getUser());
     $event->setConduitRequest($request);
     PhutilEventEngine::dispatchEvent($event);
 
     $task = $event->getValue('task');
     $transactions = $event->getValue('transactions');
 
     $content_source = PhabricatorContentSource::newForSource(
       PhabricatorContentSource::SOURCE_CONDUIT,
       array());
 
     $editor = id(new ManiphestTransactionEditor())
       ->setActor($request->getUser())
       ->setContentSource($content_source)
       ->setContinueOnNoEffect(true);
 
     if (!$is_new) {
       $editor->setContinueOnMissingFields(true);
     }
 
     $editor->applyTransactions($task, $transactions);
 
     $event = new PhabricatorEvent(
       PhabricatorEventType::TYPE_MANIPHEST_DIDEDITTASK,
       array(
         'task'          => $task,
         'new'           => $is_new,
         'transactions'  => $transactions,
       ));
     $event->setUser($request->getUser());
     $event->setConduitRequest($request);
     PhutilEventEngine::dispatchEvent($event);
-
   }
 
   protected function buildTaskInfoDictionaries(array $tasks) {
     assert_instances_of($tasks, 'ManiphestTask');
     if (!$tasks) {
       return array();
     }
 
     $task_phids = mpull($tasks, 'getPHID');
 
     $all_deps = id(new PhabricatorEdgeQuery())
       ->withSourcePHIDs($task_phids)
       ->withEdgeTypes(array(PhabricatorEdgeConfig::TYPE_TASK_DEPENDS_ON_TASK));
     $all_deps->execute();
 
     $result = array();
     foreach ($tasks as $task) {
       // TODO: Batch this get as CustomField gets cleaned up.
       $field_list = PhabricatorCustomField::getObjectFields(
         $task,
         PhabricatorCustomField::ROLE_EDIT);
       $field_list->readFieldsFromStorage($task);
 
       $auxiliary = mpull(
         $field_list->getFields(),
         'getValueForStorage',
         'getFieldKey');
 
       $task_deps = $all_deps->getDestinationPHIDs(
         array($task->getPHID()),
         array(PhabricatorEdgeConfig::TYPE_TASK_DEPENDS_ON_TASK));
 
       $result[$task->getPHID()] = array(
         'id'           => $task->getID(),
         'phid'         => $task->getPHID(),
         'authorPHID'   => $task->getAuthorPHID(),
         'ownerPHID'    => $task->getOwnerPHID(),
         'ccPHIDs'      => $task->getCCPHIDs(),
         'status'       => $task->getStatus(),
         'statusName'   => ManiphestTaskStatus::getTaskStatusName(
           $task->getStatus()),
         'isClosed'     => $task->isClosed(),
         'priority'     => ManiphestTaskPriority::getTaskPriorityName(
           $task->getPriority()),
         'priorityColor' => ManiphestTaskPriority::getTaskPriorityColor(
           $task->getPriority()),
         'title'        => $task->getTitle(),
         'description'  => $task->getDescription(),
         'projectPHIDs' => $task->getProjectPHIDs(),
         'uri'          => PhabricatorEnv::getProductionURI('/T'.$task->getID()),
         'auxiliary'    => $auxiliary,
 
         'objectName'   => 'T'.$task->getID(),
         'dateCreated'  => $task->getDateCreated(),
         'dateModified' => $task->getDateModified(),
         'dependsOnTaskPHIDs' => $task_deps,
       );
     }
 
     return $result;
   }
 
   /**
    * Note this is a temporary stop gap since its easy to make malformed Tasks.
    * Long-term, the values set in @{method:defineParamTypes} will be used to
    * validate data implicitly within the larger Conduit application.
    *
    * TODO -- remove this in favor of generalized Conduit hotness
    */
   private function validatePHIDList(array $phid_list, $phid_type, $field) {
     $phid_groups = phid_group_by_type($phid_list);
     unset($phid_groups[$phid_type]);
     if (!empty($phid_groups)) {
       throw id(new ConduitException('ERR-INVALID-PARAMETER'))
         ->setErrorDescription(
           'One or more PHIDs were invalid for '.$field.'.');
     }
 
     return true;
   }
 
 }
diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_createtask_Method.php b/src/applications/maniphest/conduit/ConduitAPI_maniphest_createtask_Method.php
index 6771301321..3eaf5fa214 100644
--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_createtask_Method.php
+++ b/src/applications/maniphest/conduit/ConduitAPI_maniphest_createtask_Method.php
@@ -1,35 +1,32 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_maniphest_createtask_Method
   extends ConduitAPI_maniphest_Method {
 
   public function getMethodDescription() {
     return 'Create a new Maniphest task.';
   }
 
   public function defineParamTypes() {
     return $this->getTaskFields($is_new = true);
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-INVALID-PARAMETER' => 'Missing or malformed parameter.'
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $task = ManiphestTask::initializeNewTask($request->getUser());
 
     $this->applyRequest($task, $request, $is_new = true);
 
     return $this->buildTaskInfoDictionary($task);
   }
 
 }
diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_find_Method.php b/src/applications/maniphest/conduit/ConduitAPI_maniphest_find_Method.php
index d5ccc8acc3..42dc4a701e 100644
--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_find_Method.php
+++ b/src/applications/maniphest/conduit/ConduitAPI_maniphest_find_Method.php
@@ -1,23 +1,21 @@
 <?php
 
 /**
- * @group conduit
- *
  * @concrete-extensible
  */
 final class ConduitAPI_maniphest_find_Method
   extends ConduitAPI_maniphest_query_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_DEPRECATED;
   }
 
   public function getMethodStatusDescription() {
     return "Renamed to 'maniphest.query'.";
   }
 
   public function getMethodDescription() {
     return 'Deprecated alias of maniphest.query';
   }
 
 }
diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_gettasktransactions_Method.php b/src/applications/maniphest/conduit/ConduitAPI_maniphest_gettasktransactions_Method.php
index 61f9c85dcf..5233bac02d 100644
--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_gettasktransactions_Method.php
+++ b/src/applications/maniphest/conduit/ConduitAPI_maniphest_gettasktransactions_Method.php
@@ -1,77 +1,75 @@
 <?php
 
-/**
- * @group maniphest
- */
 final class ConduitAPI_maniphest_gettasktransactions_Method
   extends ConduitAPI_maniphest_Method {
 
   public function getMethodDescription() {
     return 'Retrieve Maniphest Task Transactions.';
   }
 
   public function defineParamTypes() {
     return array(
       'ids' => 'required list<int>',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty list<dict<string, wild>>';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $results = array();
     $task_ids = $request->getValue('ids');
 
     if (!$task_ids) {
       return $results;
     }
 
     $tasks = id(new ManiphestTaskQuery())
       ->setViewer($request->getUser())
       ->withIDs($task_ids)
       ->execute();
     $tasks = mpull($tasks, null, 'getPHID');
 
     $transactions = array();
     if ($tasks) {
       $transactions = id(new ManiphestTransactionQuery())
         ->setViewer($request->getUser())
         ->withObjectPHIDs(mpull($tasks, 'getPHID'))
         ->needComments(true)
         ->execute();
     }
 
     foreach ($transactions as $transaction) {
       $task_phid = $transaction->getObjectPHID();
       if (empty($tasks[$task_phid])) {
         continue;
       }
 
       $task_id = $tasks[$task_phid]->getID();
 
       $comments = null;
       if ($transaction->hasComment()) {
         $comments = $transaction->getComment()->getContent();
       }
 
       $results[$task_id][] = array(
         'taskID'  => $task_id,
         'transactionType'  => $transaction->getTransactionType(),
         'oldValue'  => $transaction->getOldValue(),
         'newValue'  => $transaction->getNewValue(),
         'comments'      => $comments,
         'authorPHID'  => $transaction->getAuthorPHID(),
         'dateCreated' => $transaction->getDateCreated(),
       );
     }
 
     return $results;
   }
+
 }
diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_info_Method.php b/src/applications/maniphest/conduit/ConduitAPI_maniphest_info_Method.php
index da6d4c1f1e..1642182954 100644
--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_info_Method.php
+++ b/src/applications/maniphest/conduit/ConduitAPI_maniphest_info_Method.php
@@ -1,44 +1,40 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_maniphest_info_Method
   extends ConduitAPI_maniphest_Method {
 
-
   public function getMethodDescription() {
     return 'Retrieve information about a Maniphest task, given its id.';
   }
 
   public function defineParamTypes() {
     return array(
       'task_id' => 'required id',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_BAD_TASK' => 'No such maniphest task exists',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $task_id = $request->getValue('task_id');
 
     $task = id(new ManiphestTaskQuery())
       ->setViewer($request->getUser())
       ->withIDs(array($task_id))
       ->executeOne();
     if (!$task) {
       throw new ConduitException('ERR_BAD_TASK');
     }
 
     return $this->buildTaskInfoDictionary($task);
   }
 
 }
diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_query_Method.php b/src/applications/maniphest/conduit/ConduitAPI_maniphest_query_Method.php
index 5a551e3b32..c1d90aaf3d 100644
--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_query_Method.php
+++ b/src/applications/maniphest/conduit/ConduitAPI_maniphest_query_Method.php
@@ -1,129 +1,123 @@
 <?php
 
 /**
- * @group conduit
- *
  * TODO: Remove maniphest.find, then make this final.
  *
  * @concrete-extensible
  */
-class ConduitAPI_maniphest_query_Method
-  extends ConduitAPI_maniphest_Method {
-
+class ConduitAPI_maniphest_query_Method extends ConduitAPI_maniphest_Method {
 
   public function getMethodDescription() {
     return 'Execute complex searches for Maniphest tasks.';
   }
 
   public function defineParamTypes() {
-
     $statuses = array(
       ManiphestTaskQuery::STATUS_ANY,
       ManiphestTaskQuery::STATUS_OPEN,
       ManiphestTaskQuery::STATUS_CLOSED,
       ManiphestTaskQuery::STATUS_RESOLVED,
       ManiphestTaskQuery::STATUS_WONTFIX,
       ManiphestTaskQuery::STATUS_INVALID,
       ManiphestTaskQuery::STATUS_SPITE,
       ManiphestTaskQuery::STATUS_DUPLICATE,
     );
     $status_const = $this->formatStringConstants($statuses);
 
     $orders = array(
       ManiphestTaskQuery::ORDER_PRIORITY,
       ManiphestTaskQuery::ORDER_CREATED,
       ManiphestTaskQuery::ORDER_MODIFIED,
     );
     $order_const = $this->formatStringConstants($orders);
 
     return array(
       'ids'               => 'optional list<uint>',
       'phids'             => 'optional list<phid>',
       'ownerPHIDs'        => 'optional list<phid>',
       'authorPHIDs'       => 'optional list<phid>',
       'projectPHIDs'      => 'optional list<phid>',
       'ccPHIDs'           => 'optional list<phid>',
       'fullText'          => 'optional string',
 
       'status'            => 'optional '.$status_const,
       'order'             => 'optional '.$order_const,
 
       'limit'             => 'optional int',
       'offset'            => 'optional int',
     );
   }
 
   public function defineReturnType() {
     return 'list';
   }
 
   public function defineErrorTypes() {
-    return array(
-    );
+    return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $query = new ManiphestTaskQuery();
 
     $query->setViewer($request->getUser());
 
     $task_ids = $request->getValue('ids');
     if ($task_ids) {
       $query->withIDs($task_ids);
     }
 
     $task_phids = $request->getValue('phids');
     if ($task_phids) {
       $query->withPHIDs($task_phids);
     }
 
     $owners = $request->getValue('ownerPHIDs');
     if ($owners) {
       $query->withOwners($owners);
     }
 
     $authors = $request->getValue('authorPHIDs');
     if ($authors) {
       $query->withAuthors($authors);
     }
 
     $projects = $request->getValue('projectPHIDs');
     if ($projects) {
       $query->withAllProjects($projects);
     }
 
     $ccs = $request->getValue('ccPHIDs');
     if ($ccs) {
       $query->withSubscribers($ccs);
     }
 
     $full_text = $request->getValue('fullText');
     if ($full_text) {
       $query->withFullTextSearch($full_text);
     }
 
     $status = $request->getValue('status');
     if ($status) {
       $query->withStatus($status);
     }
 
     $order = $request->getValue('order');
     if ($order) {
       $query->setOrderBy($order);
     }
 
     $limit = $request->getValue('limit');
     if ($limit) {
       $query->setLimit($limit);
     }
 
     $offset = $request->getValue('offset');
     if ($offset) {
       $query->setOffset($offset);
     }
 
     $results = $query->execute();
     return $this->buildTaskInfoDictionaries($results);
   }
 
 }
diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_update_Method.php b/src/applications/maniphest/conduit/ConduitAPI_maniphest_update_Method.php
index 99969d108c..49324349bc 100644
--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_update_Method.php
+++ b/src/applications/maniphest/conduit/ConduitAPI_maniphest_update_Method.php
@@ -1,66 +1,63 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_maniphest_update_Method
   extends ConduitAPI_maniphest_Method {
 
   public function getMethodDescription() {
     return 'Update an existing Maniphest task.';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-BAD-TASK'          => 'No such maniphest task exists.',
       'ERR-INVALID-PARAMETER' => 'Missing or malformed parameter.',
       'ERR-NO-EFFECT'         => 'Update has no effect.',
     );
   }
 
   public function defineParamTypes() {
     return $this->getTaskFields($is_new = false);
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $id = $request->getValue('id');
     $phid = $request->getValue('phid');
 
     if (($id && $phid) || (!$id && !$phid)) {
       throw new Exception("Specify exactly one of 'id' and 'phid'.");
     }
 
     if ($id) {
       $task = id(new ManiphestTaskQuery())
         ->setViewer($request->getUser())
         ->withIDs(array($id))
         ->executeOne();
     } else {
       $task = id(new ManiphestTaskQuery())
         ->setViewer($request->getUser())
         ->withPHIDs(array($phid))
         ->executeOne();
     }
 
     $params = $request->getAllParameters();
     unset($params['id']);
     unset($params['phid']);
 
     if (call_user_func_array('coalesce', $params) === null) {
       throw new ConduitException('ERR-NO-EFFECT');
     }
 
     if (!$task) {
       throw new ConduitException('ERR-BAD-TASK');
     }
 
     $this->applyRequest($task, $request, $is_new = false);
 
     return $this->buildTaskInfoDictionary($task);
   }
 
 }
diff --git a/src/applications/maniphest/constants/ManiphestConstants.php b/src/applications/maniphest/constants/ManiphestConstants.php
index 3a1f2ab4c4..fa0d78b6a0 100644
--- a/src/applications/maniphest/constants/ManiphestConstants.php
+++ b/src/applications/maniphest/constants/ManiphestConstants.php
@@ -1,8 +1,3 @@
 <?php
 
-/**
- * @group maniphest
- */
-abstract class ManiphestConstants {
-
-}
+abstract class ManiphestConstants {}
diff --git a/src/applications/maniphest/constants/ManiphestTaskOwner.php b/src/applications/maniphest/constants/ManiphestTaskOwner.php
index 642c8b85a5..c2c8ae1946 100644
--- a/src/applications/maniphest/constants/ManiphestTaskOwner.php
+++ b/src/applications/maniphest/constants/ManiphestTaskOwner.php
@@ -1,11 +1,8 @@
 <?php
 
-/**
- * @group maniphest
- */
 final class ManiphestTaskOwner extends ManiphestConstants {
 
   const OWNER_UP_FOR_GRABS = 'PHID-!!!!-UP-FOR-GRABS';
   const PROJECT_NO_PROJECT = 'PHID-!!!!-NO-PROJECT';
 
 }
diff --git a/src/applications/maniphest/controller/ManiphestBatchEditController.php b/src/applications/maniphest/controller/ManiphestBatchEditController.php
index 1768db2011..98b676d02b 100644
--- a/src/applications/maniphest/controller/ManiphestBatchEditController.php
+++ b/src/applications/maniphest/controller/ManiphestBatchEditController.php
@@ -1,339 +1,335 @@
 <?php
 
-/**
- * @group maniphest
- */
 final class ManiphestBatchEditController extends ManiphestController {
 
   public function processRequest() {
-
     $this->requireApplicationCapability(
       ManiphestCapabilityBulkEdit::CAPABILITY);
 
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $task_ids = $request->getArr('batch');
     $tasks = id(new ManiphestTaskQuery())
       ->setViewer($user)
       ->withIDs($task_ids)
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->execute();
 
     $actions = $request->getStr('actions');
     if ($actions) {
       $actions = json_decode($actions, true);
     }
 
     if ($request->isFormPost() && is_array($actions)) {
       foreach ($tasks as $task) {
         $field_list = PhabricatorCustomField::getObjectFields(
           $task,
           PhabricatorCustomField::ROLE_EDIT);
         $field_list->readFieldsFromStorage($task);
 
         $xactions = $this->buildTransactions($actions, $task);
         if ($xactions) {
           // TODO: Set content source to "batch edit".
 
           $editor = id(new ManiphestTransactionEditor())
             ->setActor($user)
             ->setContentSourceFromRequest($request)
             ->setContinueOnNoEffect(true)
             ->setContinueOnMissingFields(true)
             ->applyTransactions($task, $xactions);
         }
       }
 
       $task_ids = implode(',', mpull($tasks, 'getID'));
 
       return id(new AphrontRedirectResponse())
         ->setURI('/maniphest/?ids='.$task_ids);
     }
 
     $handles = ManiphestTaskListView::loadTaskHandles($user, $tasks);
 
     $list = new ManiphestTaskListView();
     $list->setTasks($tasks);
     $list->setUser($user);
     $list->setHandles($handles);
 
     $template = new AphrontTokenizerTemplateView();
     $template = $template->render();
 
     require_celerity_resource('maniphest-batch-editor');
     Javelin::initBehavior(
       'maniphest-batch-editor',
       array(
         'root' => 'maniphest-batch-edit-form',
         'tokenizerTemplate' => $template,
         'sources' => array(
           'project' => array(
             'src'           => '/typeahead/common/projects/',
             'placeholder'   => pht('Type a project name...'),
           ),
           'owner' => array(
             'src'           => '/typeahead/common/searchowner/',
             'placeholder'   => pht('Type a user name...'),
             'limit'         => 1,
           ),
           'cc'    => array(
             'src'           => '/typeahead/common/mailable/',
             'placeholder'   => pht('Type a user name...'),
           )
         ),
         'input' => 'batch-form-actions',
         'priorityMap' => ManiphestTaskPriority::getTaskPriorityMap(),
         'statusMap'   => ManiphestTaskStatus::getTaskStatusMap(),
       ));
 
     $form = new AphrontFormView();
     $form->setUser($user);
     $form->setID('maniphest-batch-edit-form');
 
     foreach ($tasks as $task) {
       $form->appendChild(
         phutil_tag(
           'input',
           array(
             'type' => 'hidden',
             'name' => 'batch[]',
             'value' => $task->getID(),
           )));
     }
 
     $form->appendChild(
       phutil_tag(
         'input',
         array(
           'type' => 'hidden',
           'name' => 'actions',
           'id'   => 'batch-form-actions',
         )));
     $form->appendChild(
       phutil_tag('p', array(), pht('These tasks will be edited:')));
     $form->appendChild($list);
     $form->appendChild(
       id(new AphrontFormInsetView())
         ->setTitle('Actions')
         ->setRightButton(javelin_tag(
             'a',
             array(
               'href' => '#',
               'class' => 'button green',
               'sigil' => 'add-action',
               'mustcapture' => true,
             ),
             pht('Add Another Action')))
         ->setContent(javelin_tag(
           'table',
           array(
             'sigil' => 'maniphest-batch-actions',
             'class' => 'maniphest-batch-actions-table',
           ),
           '')))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Update Tasks'))
           ->addCancelButton('/maniphest/'));
 
     $title = pht('Batch Editor');
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($title);
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Batch Edit Tasks'))
       ->setForm($form);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $form_box,
       ),
       array(
         'title' => $title,
         'device' => false,
       ));
   }
 
   private function buildTransactions($actions, ManiphestTask $task) {
     $value_map = array();
     $type_map = array(
       'add_comment'     => PhabricatorTransactions::TYPE_COMMENT,
       'assign'          => ManiphestTransaction::TYPE_OWNER,
       'status'          => ManiphestTransaction::TYPE_STATUS,
       'priority'        => ManiphestTransaction::TYPE_PRIORITY,
       'add_project'     => ManiphestTransaction::TYPE_PROJECTS,
       'remove_project'  => ManiphestTransaction::TYPE_PROJECTS,
       'add_ccs'         => ManiphestTransaction::TYPE_CCS,
       'remove_ccs'      => ManiphestTransaction::TYPE_CCS,
     );
 
     $edge_edit_types = array(
       'add_project'    => true,
       'remove_project' => true,
       'add_ccs'        => true,
       'remove_ccs'     => true,
     );
 
     $xactions = array();
     foreach ($actions as $action) {
       if (empty($type_map[$action['action']])) {
         throw new Exception("Unknown batch edit action '{$action}'!");
       }
 
       $type = $type_map[$action['action']];
 
       // Figure out the current value, possibly after modifications by other
       // batch actions of the same type. For example, if the user chooses to
       // "Add Comment" twice, we should add both comments. More notably, if the
       // user chooses "Remove Project..." and also "Add Project...", we should
       // avoid restoring the removed project in the second transaction.
 
       if (array_key_exists($type, $value_map)) {
         $current = $value_map[$type];
       } else {
         switch ($type) {
           case PhabricatorTransactions::TYPE_COMMENT:
             $current = null;
             break;
           case ManiphestTransaction::TYPE_OWNER:
             $current = $task->getOwnerPHID();
             break;
           case ManiphestTransaction::TYPE_STATUS:
             $current = $task->getStatus();
             break;
           case ManiphestTransaction::TYPE_PRIORITY:
             $current = $task->getPriority();
             break;
           case ManiphestTransaction::TYPE_PROJECTS:
             $current = $task->getProjectPHIDs();
             break;
           case ManiphestTransaction::TYPE_CCS:
             $current = $task->getCCPHIDs();
             break;
         }
       }
 
       // Check if the value is meaningful / provided, and normalize it if
       // necessary. This discards, e.g., empty comments and empty owner
       // changes.
 
       $value = $action['value'];
       switch ($type) {
         case PhabricatorTransactions::TYPE_COMMENT:
           if (!strlen($value)) {
             continue 2;
           }
           break;
         case ManiphestTransaction::TYPE_OWNER:
           if (empty($value)) {
             continue 2;
           }
           $value = head($value);
           if ($value === ManiphestTaskOwner::OWNER_UP_FOR_GRABS) {
             $value = null;
           }
           break;
         case ManiphestTransaction::TYPE_PROJECTS:
           if (empty($value)) {
             continue 2;
           }
           break;
         case ManiphestTransaction::TYPE_CCS:
           if (empty($value)) {
             continue 2;
           }
           break;
       }
 
       // If the edit doesn't change anything, go to the next action. This
       // check is only valid for changes like "owner", "status", etc, not
       // for edge edits, because we should still apply an edit like
       // "Remove Projects: A, B" to a task with projects "A, B".
 
       if (empty($edge_edit_types[$action['action']])) {
         if ($value == $current) {
           continue;
         }
       }
 
       // Apply the value change; for most edits this is just replacement, but
       // some need to merge the current and edited values (add/remove project).
 
       switch ($type) {
         case PhabricatorTransactions::TYPE_COMMENT:
           if (strlen($current)) {
             $value = $current."\n\n".$value;
           }
           break;
         case ManiphestTransaction::TYPE_PROJECTS:
         case ManiphestTransaction::TYPE_CCS:
           $remove_actions = array(
             'remove_project' => true,
             'remove_ccs'    => true,
           );
           $is_remove = isset($remove_actions[$action['action']]);
 
           $current = array_fill_keys($current, true);
           $value   = array_fill_keys($value, true);
 
           $new = $current;
           $did_something = false;
 
           if ($is_remove) {
             foreach ($value as $phid => $ignored) {
               if (isset($new[$phid])) {
                 unset($new[$phid]);
                 $did_something = true;
               }
             }
           } else {
             foreach ($value as $phid => $ignored) {
               if (empty($new[$phid])) {
                 $new[$phid] = true;
                 $did_something = true;
               }
             }
           }
 
           if (!$did_something) {
             continue 2;
           }
 
           $value = array_keys($new);
           break;
       }
 
       $value_map[$type] = $value;
     }
 
     $template = new ManiphestTransaction();
 
     foreach ($value_map as $type => $value) {
       $xaction = clone $template;
       $xaction->setTransactionType($type);
 
       switch ($type) {
         case PhabricatorTransactions::TYPE_COMMENT:
           $xaction->attachComment(
             id(new ManiphestTransactionComment())
               ->setContent($value));
           break;
         default:
           $xaction->setNewValue($value);
           break;
       }
 
       $xactions[] = $xaction;
     }
 
     return $xactions;
   }
 
 }
diff --git a/src/applications/maniphest/controller/ManiphestExportController.php b/src/applications/maniphest/controller/ManiphestExportController.php
index f30b5cb930..9c84c39491 100644
--- a/src/applications/maniphest/controller/ManiphestExportController.php
+++ b/src/applications/maniphest/controller/ManiphestExportController.php
@@ -1,140 +1,137 @@
 <?php
 
-/**
- * @group maniphest
- */
 final class ManiphestExportController extends ManiphestController {
 
   private $key;
 
   public function willProcessRequest(array $data) {
     $this->key = $data['key'];
     return $this;
   }
 
   /**
    * @phutil-external-symbol class PHPExcel
    * @phutil-external-symbol class PHPExcel_IOFactory
    * @phutil-external-symbol class PHPExcel_Style_NumberFormat
    * @phutil-external-symbol class PHPExcel_Cell_DataType
    */
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $ok = @include_once 'PHPExcel.php';
     if (!$ok) {
       $dialog = new AphrontDialogView();
       $dialog->setUser($user);
 
       $inst1 = pht(
         'This system does not have PHPExcel installed. This software '.
         'component is required to export tasks to Excel. Have your system '.
         'administrator install it from:');
 
       $inst2 = pht(
         'Your PHP "include_path" needs to be updated to include the '.
         'PHPExcel Classes directory.');
 
       $dialog->setTitle(pht('Excel Export Not Configured'));
       $dialog->appendChild(hsprintf(
         '<p>%s</p>'.
         '<br />'.
         '<p>'.
           '<a href="http://www.phpexcel.net/">http://www.phpexcel.net/</a>'.
         '</p>'.
         '<br />'.
         '<p>%s</p>',
         $inst1,
         $inst2));
 
       $dialog->addCancelButton('/maniphest/');
       return id(new AphrontDialogResponse())->setDialog($dialog);
     }
 
     // TODO: PHPExcel has a dependency on the PHP zip extension. We should test
     // for that here, since it fatals if we don't have the ZipArchive class.
 
     $saved = id(new PhabricatorSavedQueryQuery())
       ->setViewer($user)
       ->withQueryKeys(array($this->key))
       ->executeOne();
     if (!$saved) {
       $engine = id(new ManiphestTaskSearchEngine())
         ->setViewer($user);
       if ($engine->isBuiltinQuery($this->key)) {
         $saved = $engine->buildSavedQueryFromBuiltin($this->key);
       }
       if (!$saved) {
         return new Aphront404Response();
       }
     }
 
     $formats = ManiphestExcelFormat::loadAllFormats();
     $export_formats = array();
     foreach ($formats as $format_class => $format_object) {
       $export_formats[$format_class] = $format_object->getName();
     }
 
     if (!$request->isDialogFormPost()) {
       $dialog = new AphrontDialogView();
       $dialog->setUser($user);
 
       $dialog->setTitle(pht('Export Tasks to Excel'));
       $dialog->appendChild(phutil_tag('p', array(), pht(
         'Do you want to export the query results to Excel?')));
 
       $form = id(new PHUIFormLayoutView())
         ->appendChild(
           id(new AphrontFormSelectControl())
             ->setLabel(pht('Format:'))
             ->setName('excel-format')
             ->setOptions($export_formats));
 
       $dialog->appendChild($form);
 
       $dialog->addCancelButton('/maniphest/');
       $dialog->addSubmitButton(pht('Export to Excel'));
       return id(new AphrontDialogResponse())->setDialog($dialog);
     }
 
     $format = idx($formats, $request->getStr('excel-format'));
     if ($format === null) {
       throw new Exception('Excel format object not found.');
     }
 
     $saved->makeEphemeral();
     $saved->setParameter('limit', PHP_INT_MAX);
 
     $engine = id(new ManiphestTaskSearchEngine())
       ->setViewer($user);
 
     $query = $engine->buildQueryFromSavedQuery($saved);
     $query->setViewer($user);
     $tasks = $query->execute();
 
     $all_projects = array_mergev(mpull($tasks, 'getProjectPHIDs'));
     $all_assigned = mpull($tasks, 'getOwnerPHID');
 
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($user)
       ->withPHIDs(array_merge($all_projects, $all_assigned))
       ->execute();
 
     $workbook = new PHPExcel();
     $format->buildWorkbook($workbook, $tasks, $handles, $user);
     $writer = PHPExcel_IOFactory::createWriter($workbook, 'Excel2007');
 
     ob_start();
     $writer->save('php://output');
     $data = ob_get_clean();
 
     $mime = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
 
     return id(new AphrontFileResponse())
       ->setMimeType($mime)
       ->setDownload($format->getFileName().'.xlsx')
       ->setContent($data);
   }
 
 }
diff --git a/src/applications/maniphest/controller/ManiphestSubpriorityController.php b/src/applications/maniphest/controller/ManiphestSubpriorityController.php
index 4290c3bc02..5deebdf8ef 100644
--- a/src/applications/maniphest/controller/ManiphestSubpriorityController.php
+++ b/src/applications/maniphest/controller/ManiphestSubpriorityController.php
@@ -1,64 +1,61 @@
 <?php
 
-/**
- * @group maniphest
- */
 final class ManiphestSubpriorityController extends ManiphestController {
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     if (!$request->validateCSRF()) {
       return new Aphront403Response();
     }
 
     $task = id(new ManiphestTaskQuery())
       ->setViewer($user)
       ->withIDs(array($request->getInt('task')))
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->executeOne();
     if (!$task) {
       return new Aphront404Response();
     }
 
     if ($request->getInt('after')) {
       $after_task = id(new ManiphestTaskQuery())
         ->setViewer($user)
         ->withIDs(array($request->getInt('after')))
         ->executeOne();
       if (!$after_task) {
         return new Aphront404Response();
       }
       $after_pri = $after_task->getPriority();
       $after_sub = $after_task->getSubpriority();
     } else {
       $after_pri = $request->getInt('priority');
       $after_sub = null;
     }
 
     $xactions = array(id(new ManiphestTransaction())
       ->setTransactionType(ManiphestTransaction::TYPE_SUBPRIORITY)
       ->setNewValue(array(
         'newPriority' => $after_pri,
         'newSubpriorityBase' => $after_sub,
         'direction' => '>')));
     $editor = id(new ManiphestTransactionEditor())
       ->setActor($user)
       ->setContinueOnMissingFields(true)
       ->setContinueOnNoEffect(true)
       ->setContentSourceFromRequest($request);
 
     $editor->applyTransactions($task, $xactions);
 
     return id(new AphrontAjaxResponse())->setContent(
       array(
         'tasks' => $this->renderSingleTask($task),
       ));
   }
 
 }
diff --git a/src/applications/maniphest/controller/ManiphestTaskDescriptionPreviewController.php b/src/applications/maniphest/controller/ManiphestTaskDescriptionPreviewController.php
index 98725245f1..06f01786b3 100644
--- a/src/applications/maniphest/controller/ManiphestTaskDescriptionPreviewController.php
+++ b/src/applications/maniphest/controller/ManiphestTaskDescriptionPreviewController.php
@@ -1,26 +1,24 @@
 <?php
 
-/**
- * @group maniphest
- */
 final class ManiphestTaskDescriptionPreviewController
   extends ManiphestController {
 
   public function processRequest() {
     $request = $this->getRequest();
     $description = $request->getStr('description');
 
     $task = new ManiphestTask();
     $task->setDescription($description);
 
     $output = PhabricatorMarkupEngine::renderOneObject(
       $task,
       ManiphestTask::MARKUP_FIELD_DESCRIPTION,
       $request->getUser());
 
     $content = phutil_tag_div('phabricator-remarkup', $output);
 
     return id(new AphrontAjaxResponse())
       ->setContent($content);
   }
+
 }
diff --git a/src/applications/maniphest/controller/ManiphestTransactionPreviewController.php b/src/applications/maniphest/controller/ManiphestTransactionPreviewController.php
index 776f802447..75f75c49bc 100644
--- a/src/applications/maniphest/controller/ManiphestTransactionPreviewController.php
+++ b/src/applications/maniphest/controller/ManiphestTransactionPreviewController.php
@@ -1,135 +1,132 @@
 <?php
 
-/**
- * @group maniphest
- */
 final class ManiphestTransactionPreviewController extends ManiphestController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
 
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $comments = $request->getStr('comments');
 
     $task = id(new ManiphestTaskQuery())
       ->setViewer($user)
       ->withIDs(array($this->id))
       ->executeOne();
     if (!$task) {
       return new Aphront404Response();
     }
 
     id(new PhabricatorDraft())
       ->setAuthorPHID($user->getPHID())
       ->setDraftKey($task->getPHID())
       ->setDraft($comments)
       ->replaceOrDelete();
 
     $action = $request->getStr('action');
 
     $transaction = new ManiphestTransaction();
     $transaction->setAuthorPHID($user->getPHID());
     $transaction->setTransactionType($action);
 
     // This should really be split into a separate transaction, but it should
     // all come out in the wash once we fully move to modern stuff.
     $transaction->attachComment(
       id(new ManiphestTransactionComment())
         ->setContent($comments));
 
     $value = $request->getStr('value');
     // grab phids for handles and set transaction values based on action and
     // value (empty or control-specific format) coming in from the wire
     switch ($action) {
       case ManiphestTransaction::TYPE_PRIORITY:
         $transaction->setOldValue($task->getPriority());
         $transaction->setNewValue($value);
         break;
       case ManiphestTransaction::TYPE_OWNER:
         if ($value) {
           $value = current(json_decode($value));
           $phids = array($value);
         } else {
           $phids = array();
         }
         $transaction->setNewValue($value);
         break;
       case ManiphestTransaction::TYPE_CCS:
         if ($value) {
           $value = json_decode($value);
         }
         if (!$value) {
           $value = array();
         }
         $phids = $value;
 
         foreach ($task->getCCPHIDs() as $cc_phid) {
           $phids[] = $cc_phid;
           $value[] = $cc_phid;
         }
 
         $transaction->setOldValue($task->getCCPHIDs());
         $transaction->setNewValue($value);
         break;
       case ManiphestTransaction::TYPE_PROJECTS:
         if ($value) {
           $value = json_decode($value);
         }
         if (!$value) {
           $value = array();
         }
 
         $phids = $value;
         foreach ($task->getProjectPHIDs() as $project_phid) {
           $phids[] = $project_phid;
           $value[] = $project_phid;
         }
 
         $transaction->setOldValue($task->getProjectPHIDs());
         $transaction->setNewValue($value);
         break;
       case ManiphestTransaction::TYPE_STATUS:
         $phids = array();
         $transaction->setOldValue($task->getStatus());
         $transaction->setNewValue($value);
         break;
       default:
         $phids = array();
         $transaction->setNewValue($value);
         break;
     }
     $phids[] = $user->getPHID();
 
     $handles = $this->loadViewerHandles($phids);
 
     $transactions = array();
     $transactions[] = $transaction;
 
     $engine = new PhabricatorMarkupEngine();
     $engine->setViewer($user);
     if ($transaction->hasComment()) {
       $engine->addObject(
         $transaction->getComment(),
         PhabricatorApplicationTransactionComment::MARKUP_FIELD_COMMENT);
     }
     $engine->process();
 
     $transaction->setHandles($handles);
 
     $view = id(new PhabricatorApplicationTransactionView())
       ->setUser($user)
       ->setTransactions($transactions)
       ->setIsPreview(true);
 
     return id(new AphrontAjaxResponse())
       ->setContent((string)phutil_implode_html('', $view->buildEvents()));
   }
 
 }
diff --git a/src/applications/maniphest/event/ManiphestEdgeEventListener.php b/src/applications/maniphest/event/ManiphestEdgeEventListener.php
index d143acec50..8e2552d110 100644
--- a/src/applications/maniphest/event/ManiphestEdgeEventListener.php
+++ b/src/applications/maniphest/event/ManiphestEdgeEventListener.php
@@ -1,139 +1,137 @@
 <?php
 
 /**
  * Listener for Maniphest Task edge events. When some workflow causes task
  * edges to be added or removed, we consider the edge edit authoritative but
- * duplicate the information into a ManiphestTansaction for display.
- *
- * @group maniphest
+ * duplicate the information into a @{class:ManiphestTansaction} for display.
  */
 final class ManiphestEdgeEventListener extends PhabricatorEventListener {
 
   private $edges = array();
   private $tasks = array();
 
   public function register() {
     $this->listen(PhabricatorEventType::TYPE_EDGE_WILLEDITEDGES);
     $this->listen(PhabricatorEventType::TYPE_EDGE_DIDEDITEDGES);
   }
 
   public function handleEvent(PhutilEvent $event) {
     switch ($event->getType()) {
       case PhabricatorEventType::TYPE_EDGE_WILLEDITEDGES:
         return $this->handleWillEditEvent($event);
       case PhabricatorEventType::TYPE_EDGE_DIDEDITEDGES:
         return $this->handleDidEditEvent($event);
     }
   }
 
   private function handleWillEditEvent(PhutilEvent $event) {
     // NOTE: Everything is namespaced by `id` so that we aren't left in an
     // inconsistent state if an edit fails to complete (e.g., something throws)
     // or an edit happens inside another edit.
 
     $id = $event->getValue('id');
 
     $edges = $this->loadAllEdges($event);
     $tasks = array();
     if ($edges) {
       // TODO: T603 This should probably all get nuked. Until then, this isn't
       // realllllly a policy issue since callers are (or should be) doing
       // policy checks anyway.
       $tasks = id(new ManiphestTask())->loadAllWhere(
         'phid IN (%Ls)',
         array_keys($edges));
       $tasks = mpull($tasks, null, 'getPHID');
     }
 
     $this->edges[$id] = $edges;
     $this->tasks[$id] = $tasks;
   }
 
   private function handleDidEditEvent(PhutilEvent $event) {
     $id = $event->getValue('id');
 
     $old_edges = $this->edges[$id];
     $tasks = $this->tasks[$id];
 
     unset($this->edges[$id]);
     unset($this->tasks[$id]);
 
     $content_source = PhabricatorContentSource::newForSource(
       PhabricatorContentSource::SOURCE_LEGACY,
       array());
 
     $new_edges = $this->loadAllEdges($event);
     $editor = id(new ManiphestTransactionEditor())
       ->setActor($event->getUser())
       ->setContentSource($content_source)
       ->setContinueOnNoEffect(true)
       ->setContinueOnMissingFields(true);
 
     foreach ($tasks as $phid => $task) {
       $xactions = array();
 
       $old = $old_edges[$phid];
       $new = $new_edges[$phid];
 
       $types = array_keys($old + $new);
       foreach ($types as $type) {
         $old_type = idx($old, $type, array());
         $new_type = idx($new, $type, array());
 
         if ($old_type === $new_type) {
           continue;
         }
 
         $xactions[] = id(new ManiphestTransaction())
           ->setTransactionType(ManiphestTransaction::TYPE_EDGE)
           ->setOldValue($old_type)
           ->setNewValue($new_type)
           ->setMetadataValue('edge:type', $type);
       }
 
       if ($xactions) {
         $editor->applyTransactions($task, $xactions);
       }
     }
   }
 
   private function filterEdgesBySourceType(array $edges, $type) {
     foreach ($edges as $key => $edge) {
       if ($edge['src_type'] !== $type) {
         unset($edges[$key]);
       }
     }
     return $edges;
   }
 
   private function loadAllEdges(PhutilEvent $event) {
     $add_edges = $event->getValue('add');
     $rem_edges = $event->getValue('rem');
 
     $type_task = ManiphestPHIDTypeTask::TYPECONST;
 
     $all_edges = array_merge($add_edges, $rem_edges);
     $all_edges = $this->filterEdgesBySourceType($all_edges, $type_task);
 
     if (!$all_edges) {
       return;
     }
 
     $all_tasks = array();
     $all_types = array();
     foreach ($all_edges as $edge) {
       $all_tasks[$edge['src']] = true;
       $all_types[$edge['type']] = true;
     }
 
     $all_tasks = array_keys($all_tasks);
     $all_types = array_keys($all_types);
 
     return id(new PhabricatorEdgeQuery())
       ->withSourcePHIDs($all_tasks)
       ->withEdgeTypes($all_types)
       ->needEdgeData(true)
       ->execute();
   }
 
 }
diff --git a/src/applications/maniphest/export/ManiphestExcelDefaultFormat.php b/src/applications/maniphest/export/ManiphestExcelDefaultFormat.php
index a2aa6c0a9c..792f1a8068 100644
--- a/src/applications/maniphest/export/ManiphestExcelDefaultFormat.php
+++ b/src/applications/maniphest/export/ManiphestExcelDefaultFormat.php
@@ -1,142 +1,138 @@
 <?php
 
-/**
- * @group maniphest
- */
 final class ManiphestExcelDefaultFormat extends ManiphestExcelFormat {
 
   public function getName() {
     return pht('Default');
   }
 
   public function getFileName() {
     return 'maniphest_tasks_'.date('Ymd');
   }
 
   /**
    * @phutil-external-symbol class PHPExcel
    * @phutil-external-symbol class PHPExcel_IOFactory
    * @phutil-external-symbol class PHPExcel_Style_NumberFormat
    * @phutil-external-symbol class PHPExcel_Cell_DataType
    */
   public function buildWorkbook(
     PHPExcel $workbook,
     array $tasks,
     array $handles,
     PhabricatorUser $user) {
 
     $sheet = $workbook->setActiveSheetIndex(0);
     $sheet->setTitle(pht('Tasks'));
 
     $widths = array(
       null,
       15,
       null,
       10,
       15,
       15,
       60,
       30,
       20,
       100,
     );
 
     foreach ($widths as $col => $width) {
       if ($width !== null) {
         $sheet->getColumnDimension($this->col($col))->setWidth($width);
       }
     }
 
     $status_map = ManiphestTaskStatus::getTaskStatusMap();
     $pri_map = ManiphestTaskPriority::getTaskPriorityMap();
 
     $date_format = null;
 
     $rows = array();
     $rows[] = array(
       pht('ID'),
       pht('Owner'),
       pht('Status'),
       pht('Priority'),
       pht('Date Created'),
       pht('Date Updated'),
       pht('Title'),
       pht('Projects'),
       pht('URI'),
       pht('Description'),
     );
 
     $is_date = array(
       false,
       false,
       false,
       false,
       true,
       true,
       false,
       false,
       false,
       false,
     );
 
     $header_format = array(
       'font'  => array(
         'bold' => true,
       ),
     );
 
     foreach ($tasks as $task) {
       $task_owner = null;
       if ($task->getOwnerPHID()) {
         $task_owner = $handles[$task->getOwnerPHID()]->getName();
       }
 
       $projects = array();
       foreach ($task->getProjectPHIDs() as $phid) {
         $projects[] = $handles[$phid]->getName();
       }
       $projects = implode(', ', $projects);
 
       $rows[] = array(
         'T'.$task->getID(),
         $task_owner,
         idx($status_map, $task->getStatus(), '?'),
         idx($pri_map, $task->getPriority(), '?'),
         $this->computeExcelDate($task->getDateCreated()),
         $this->computeExcelDate($task->getDateModified()),
         $task->getTitle(),
         $projects,
         PhabricatorEnv::getProductionURI('/T'.$task->getID()),
         phutil_utf8_shorten($task->getDescription(), 512),
       );
     }
 
     foreach ($rows as $row => $cols) {
       foreach ($cols as $col => $spec) {
         $cell_name = $this->col($col).($row + 1);
         $cell = $sheet
           ->setCellValue($cell_name, $spec, $return_cell = true);
 
         if ($row == 0) {
           $sheet->getStyle($cell_name)->applyFromArray($header_format);
         }
 
         if ($is_date[$col]) {
           $code = PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDD2;
           $sheet
             ->getStyle($cell_name)
             ->getNumberFormat()
             ->setFormatCode($code);
         } else {
           $cell->setDataType(PHPExcel_Cell_DataType::TYPE_STRING);
         }
       }
     }
   }
 
-
   private function col($n) {
     return chr(ord('A') + $n);
   }
 
 }
diff --git a/src/applications/maniphest/export/ManiphestExcelFormat.php b/src/applications/maniphest/export/ManiphestExcelFormat.php
index 344c05a2d1..d2e28d1b13 100644
--- a/src/applications/maniphest/export/ManiphestExcelFormat.php
+++ b/src/applications/maniphest/export/ManiphestExcelFormat.php
@@ -1,47 +1,44 @@
 <?php
 
-/**
- * @group maniphest
- */
 abstract class ManiphestExcelFormat {
 
   final public static function loadAllFormats() {
     $classes = id(new PhutilSymbolLoader())
       ->setAncestorClass(__CLASS__)
       ->setConcreteOnly(true)
       ->selectAndLoadSymbols();
 
     $objects = array();
     foreach ($classes as $class) {
       $objects[$class['name']] = newv($class['name'], array());
     }
 
     $objects = msort($objects, 'getOrder');
 
     return $objects;
   }
 
   public abstract function getName();
   public abstract function getFileName();
 
   public function getOrder() {
     return 0;
   }
 
   protected function computeExcelDate($epoch) {
     $seconds_per_day = (60 * 60 * 24);
     $offset = ($seconds_per_day * 25569);
 
     return ($epoch + $offset) / $seconds_per_day;
   }
 
   /**
    * @phutil-external-symbol class PHPExcel
    */
   public abstract function buildWorkbook(
     PHPExcel $workbook,
     array $tasks,
     array $handles,
     PhabricatorUser $user);
 
 }
diff --git a/src/applications/maniphest/mail/ManiphestReplyHandler.php b/src/applications/maniphest/mail/ManiphestReplyHandler.php
index 8408dd0cee..5b45bbd72d 100644
--- a/src/applications/maniphest/mail/ManiphestReplyHandler.php
+++ b/src/applications/maniphest/mail/ManiphestReplyHandler.php
@@ -1,190 +1,184 @@
 <?php
 
-/**
- * @group maniphest
- */
 final class ManiphestReplyHandler extends PhabricatorMailReplyHandler {
 
   public function validateMailReceiver($mail_receiver) {
     if (!($mail_receiver instanceof ManiphestTask)) {
       throw new Exception('Mail receiver is not a ManiphestTask!');
     }
   }
 
   public function getPrivateReplyHandlerEmailAddress(
     PhabricatorObjectHandle $handle) {
     return $this->getDefaultPrivateReplyHandlerEmailAddress($handle, 'T');
   }
 
   public function getPublicReplyHandlerEmailAddress() {
     return $this->getDefaultPublicReplyHandlerEmailAddress('T');
   }
 
   public function getReplyHandlerDomain() {
     return PhabricatorEnv::getEnvConfig(
       'metamta.maniphest.reply-handler-domain');
   }
 
   public function getReplyHandlerInstructions() {
     if ($this->supportsReplies()) {
       return pht(
         'Reply to comment or attach files, or !close, !claim, '.
         '!unsubscribe or !assign <username>.');
     } else {
       return null;
     }
   }
 
   protected function receiveEmail(PhabricatorMetaMTAReceivedMail $mail) {
-
     // NOTE: We'll drop in here on both the "reply to a task" and "create a
     // new task" workflows! Make sure you test both if you make changes!
 
     $task = $this->getMailReceiver();
 
     $is_new_task = !$task->getID();
 
     $user = $this->getActor();
 
     $body_data = $mail->parseBody();
     $body = $body_data['body'];
     $body = $this->enhanceBodyWithAttachments($body, $mail->getAttachments());
 
     $xactions = array();
     $content_source = PhabricatorContentSource::newForSource(
       PhabricatorContentSource::SOURCE_EMAIL,
       array(
         'id' => $mail->getID(),
       ));
 
     $template = new ManiphestTransaction();
 
     $is_unsub = false;
     if ($is_new_task) {
       // If this is a new task, create a "User created this task." transaction
       // and then set the title and description.
       $xaction = clone $template;
       $xaction->setTransactionType(ManiphestTransaction::TYPE_STATUS);
       $xaction->setNewValue(ManiphestTaskStatus::getDefaultStatus());
       $xactions[] = $xaction;
 
       $task->setAuthorPHID($user->getPHID());
       $task->setTitle(nonempty($mail->getSubject(), 'Untitled Task'));
       $task->setDescription($body);
       $task->setPriority(ManiphestTaskPriority::getDefaultPriority());
 
     } else {
 
       $command = $body_data['command'];
       $command_value = $body_data['command_value'];
 
       $ttype = PhabricatorTransactions::TYPE_COMMENT;
       $new_value = null;
       switch ($command) {
         case 'close':
           $ttype = ManiphestTransaction::TYPE_STATUS;
           $new_value = ManiphestTaskStatus::getDefaultClosedStatus();
           break;
         case 'claim':
           $ttype = ManiphestTransaction::TYPE_OWNER;
           $new_value = $user->getPHID();
           break;
         case 'assign':
           $ttype = ManiphestTransaction::TYPE_OWNER;
           if ($command_value) {
             $assign_users = id(new PhabricatorPeopleQuery())
               ->setViewer($user)
               ->withUsernames(array($command_value))
               ->execute();
             if ($assign_users) {
               $assign_user = head($assign_users);
               $new_value = $assign_user->getPHID();
             }
           }
           // assign to the user by default
           if (!$new_value) {
             $new_value = $user->getPHID();
           }
           break;
         case 'unsubscribe':
           $is_unsub = true;
           $ttype = ManiphestTransaction::TYPE_CCS;
           $ccs = $task->getCCPHIDs();
           foreach ($ccs as $k => $phid) {
             if ($phid == $user->getPHID()) {
               unset($ccs[$k]);
             }
           }
           $new_value = array_values($ccs);
           break;
       }
 
       if ($ttype != PhabricatorTransactions::TYPE_COMMENT) {
         $xaction = clone $template;
         $xaction->setTransactionType($ttype);
         $xaction->setNewValue($new_value);
         $xactions[] = $xaction;
       }
 
       if (strlen($body)) {
         $xaction = clone $template;
         $xaction->setTransactionType(PhabricatorTransactions::TYPE_COMMENT);
         $xaction->attachComment(
           id(new ManiphestTransactionComment())
             ->setContent($body));
         $xactions[] = $xaction;
       }
-
     }
 
     $ccs = $mail->loadCCPHIDs();
     $old_ccs = $task->getCCPHIDs();
     $new_ccs = array_merge($old_ccs, $ccs);
     if (!$is_unsub) {
       $new_ccs[] = $user->getPHID();
     }
     $new_ccs = array_unique($new_ccs);
 
     if (array_diff($new_ccs, $old_ccs)) {
       $cc_xaction = clone $template;
       $cc_xaction->setTransactionType(ManiphestTransaction::TYPE_CCS);
       $cc_xaction->setNewValue($new_ccs);
       $xactions[] = $cc_xaction;
     }
 
     $event = new PhabricatorEvent(
       PhabricatorEventType::TYPE_MANIPHEST_WILLEDITTASK,
       array(
         'task'          => $task,
         'mail'          => $mail,
         'new'           => $is_new_task,
         'transactions'  => $xactions,
       ));
     $event->setUser($user);
     PhutilEventEngine::dispatchEvent($event);
 
     $task = $event->getValue('task');
     $xactions = $event->getValue('transactions');
 
     $editor = id(new ManiphestTransactionEditor())
       ->setActor($user)
       ->setParentMessageID($mail->getMessageID())
       ->setExcludeMailRecipientPHIDs($this->getExcludeMailRecipientPHIDs())
       ->setContinueOnNoEffect(true)
       ->setContinueOnMissingFields(true)
       ->setContentSource($content_source)
       ->applyTransactions($task, $xactions);
 
     $event = new PhabricatorEvent(
       PhabricatorEventType::TYPE_MANIPHEST_DIDEDITTASK,
       array(
         'task'          => $task,
         'new'           => $is_new_task,
         'transactions'  => $xactions,
       ));
     $event->setUser($user);
     PhutilEventEngine::dispatchEvent($event);
-
   }
 
 }
diff --git a/src/applications/maniphest/query/ManiphestTaskQuery.php b/src/applications/maniphest/query/ManiphestTaskQuery.php
index a890926822..1b29705493 100644
--- a/src/applications/maniphest/query/ManiphestTaskQuery.php
+++ b/src/applications/maniphest/query/ManiphestTaskQuery.php
@@ -1,949 +1,942 @@
 <?php
 
 /**
  * Query tasks by specific criteria. This class uses the higher-performance
  * but less-general Maniphest indexes to satisfy queries.
- *
- * @group maniphest
  */
-final class ManiphestTaskQuery
-  extends PhabricatorCursorPagedPolicyAwareQuery {
+final class ManiphestTaskQuery extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $taskIDs             = array();
   private $taskPHIDs           = array();
   private $authorPHIDs         = array();
   private $ownerPHIDs          = array();
   private $includeUnowned      = null;
   private $projectPHIDs        = array();
   private $xprojectPHIDs       = array();
   private $subscriberPHIDs     = array();
   private $anyProjectPHIDs     = array();
   private $anyUserProjectPHIDs = array();
   private $includeNoProject    = null;
   private $dateCreatedAfter;
   private $dateCreatedBefore;
   private $dateModifiedAfter;
   private $dateModifiedBefore;
 
   private $fullTextSearch   = '';
 
   private $status           = 'status-any';
   const STATUS_ANY          = 'status-any';
   const STATUS_OPEN         = 'status-open';
   const STATUS_CLOSED       = 'status-closed';
   const STATUS_RESOLVED     = 'status-resolved';
   const STATUS_WONTFIX      = 'status-wontfix';
   const STATUS_INVALID      = 'status-invalid';
   const STATUS_SPITE        = 'status-spite';
   const STATUS_DUPLICATE    = 'status-duplicate';
 
   private $statuses;
   private $priorities;
 
   private $groupBy          = 'group-none';
   const GROUP_NONE          = 'group-none';
   const GROUP_PRIORITY      = 'group-priority';
   const GROUP_OWNER         = 'group-owner';
   const GROUP_STATUS        = 'group-status';
   const GROUP_PROJECT       = 'group-project';
 
   private $orderBy          = 'order-modified';
   const ORDER_PRIORITY      = 'order-priority';
   const ORDER_CREATED       = 'order-created';
   const ORDER_MODIFIED      = 'order-modified';
   const ORDER_TITLE         = 'order-title';
 
   const DEFAULT_PAGE_SIZE   = 1000;
 
   public function withAuthors(array $authors) {
     $this->authorPHIDs = $authors;
     return $this;
   }
 
   public function withIDs(array $ids) {
     $this->taskIDs = $ids;
     return $this;
   }
 
   public function withPHIDs(array $phids) {
     $this->taskPHIDs = $phids;
     return $this;
   }
 
   public function withOwners(array $owners) {
     $this->includeUnowned = false;
     foreach ($owners as $k => $phid) {
       if ($phid == ManiphestTaskOwner::OWNER_UP_FOR_GRABS || $phid === null) {
         $this->includeUnowned = true;
         unset($owners[$k]);
         break;
       }
     }
     $this->ownerPHIDs = $owners;
     return $this;
   }
 
   public function withAllProjects(array $projects) {
     $this->includeNoProject = false;
     foreach ($projects as $k => $phid) {
       if ($phid == ManiphestTaskOwner::PROJECT_NO_PROJECT) {
         $this->includeNoProject = true;
         unset($projects[$k]);
       }
     }
     $this->projectPHIDs = $projects;
     return $this;
   }
 
   /**
    * Add an additional "all projects" constraint to existing filters.
    *
    * This is used by boards to supplement queries.
    *
    * @param list<phid> List of project PHIDs to add to any existing constriant.
    * @return this
    */
   public function addWithAllProjects(array $projects) {
     if ($this->projectPHIDs === null) {
       $this->projectPHIDs = array();
     }
 
     return $this->withAllProjects(array_merge($this->projectPHIDs, $projects));
   }
 
   public function withoutProjects(array $projects) {
     $this->xprojectPHIDs = $projects;
     return $this;
   }
 
   public function withStatus($status) {
     $this->status = $status;
     return $this;
   }
 
   public function withStatuses(array $statuses) {
     $this->statuses = $statuses;
     return $this;
   }
 
   public function withPriorities(array $priorities) {
     $this->priorities = $priorities;
     return $this;
   }
 
   public function withSubscribers(array $subscribers) {
     $this->subscriberPHIDs = $subscribers;
     return $this;
   }
 
   public function withFullTextSearch($fulltext_search) {
     $this->fullTextSearch = $fulltext_search;
     return $this;
   }
 
   public function setGroupBy($group) {
     $this->groupBy = $group;
     return $this;
   }
 
   public function setOrderBy($order) {
     $this->orderBy = $order;
     return $this;
   }
 
   public function withAnyProjects(array $projects) {
     $this->anyProjectPHIDs = $projects;
     return $this;
   }
 
   public function withAnyUserProjects(array $users) {
     $this->anyUserProjectPHIDs = $users;
     return $this;
   }
 
   public function withDateCreatedBefore($date_created_before) {
     $this->dateCreatedBefore = $date_created_before;
     return $this;
   }
 
   public function withDateCreatedAfter($date_created_after) {
     $this->dateCreatedAfter = $date_created_after;
     return $this;
   }
 
   public function withDateModifiedBefore($date_modified_before) {
     $this->dateModifiedBefore = $date_modified_before;
     return $this;
   }
 
   public function withDateModifiedAfter($date_modified_after) {
     $this->dateModifiedAfter = $date_modified_after;
     return $this;
   }
 
   public function loadPage() {
-
     // TODO: (T603) It is possible for a user to find the PHID of a project
     // they can't see, then query for tasks in that project and deduce the
     // identity of unknown/invisible projects. Before we allow the user to
     // execute a project-based PHID query, we should verify that they
     // can see the project.
 
     $task_dao = new ManiphestTask();
     $conn = $task_dao->establishConnection('r');
 
     $where = array();
     $where[] = $this->buildTaskIDsWhereClause($conn);
     $where[] = $this->buildTaskPHIDsWhereClause($conn);
     $where[] = $this->buildStatusWhereClause($conn);
     $where[] = $this->buildStatusesWhereClause($conn);
     $where[] = $this->buildPrioritiesWhereClause($conn);
     $where[] = $this->buildAuthorWhereClause($conn);
     $where[] = $this->buildOwnerWhereClause($conn);
     $where[] = $this->buildSubscriberWhereClause($conn);
     $where[] = $this->buildProjectWhereClause($conn);
     $where[] = $this->buildAnyProjectWhereClause($conn);
     $where[] = $this->buildAnyUserProjectWhereClause($conn);
     $where[] = $this->buildXProjectWhereClause($conn);
     $where[] = $this->buildFullTextWhereClause($conn);
 
     if ($this->dateCreatedAfter) {
       $where[] = qsprintf(
         $conn,
         'dateCreated >= %d',
         $this->dateCreatedAfter);
     }
 
     if ($this->dateCreatedBefore) {
       $where[] = qsprintf(
         $conn,
         'dateCreated <= %d',
         $this->dateCreatedBefore);
     }
 
     if ($this->dateModifiedAfter) {
       $where[] = qsprintf(
         $conn,
         'dateModified >= %d',
         $this->dateModifiedAfter);
     }
 
     if ($this->dateModifiedBefore) {
       $where[] = qsprintf(
         $conn,
         'dateModified <= %d',
         $this->dateModifiedBefore);
     }
 
     $where[] = $this->buildPagingClause($conn);
 
     $where = $this->formatWhereClause($where);
 
     $having = '';
     $count = '';
 
     if (count($this->projectPHIDs) > 1) {
       // We want to treat the query as an intersection query, not a union
       // query. We sum the project count and require it be the same as the
       // number of projects we're searching for.
 
       $count = ', COUNT(project.projectPHID) projectCount';
       $having = qsprintf(
         $conn,
         'HAVING projectCount = %d',
         count($this->projectPHIDs));
     }
 
     $order = $this->buildCustomOrderClause($conn);
 
     // TODO: Clean up this nonstandardness.
     if (!$this->getLimit()) {
       $this->setLimit(self::DEFAULT_PAGE_SIZE);
     }
 
     $group_column = '';
     switch ($this->groupBy) {
       case self::GROUP_PROJECT:
         $group_column = qsprintf(
           $conn,
           ', projectGroupName.indexedObjectPHID projectGroupPHID');
         break;
     }
 
     $rows = queryfx_all(
       $conn,
       'SELECT task.* %Q %Q FROM %T task %Q %Q %Q %Q %Q %Q',
       $count,
       $group_column,
       $task_dao->getTableName(),
       $this->buildJoinsClause($conn),
       $where,
       $this->buildGroupClause($conn),
       $having,
       $order,
       $this->buildLimitClause($conn));
 
     switch ($this->groupBy) {
       case self::GROUP_PROJECT:
         $data = ipull($rows, null, 'id');
         break;
       default:
         $data = $rows;
         break;
     }
 
     $tasks = $task_dao->loadAllFromArray($data);
 
     switch ($this->groupBy) {
       case self::GROUP_PROJECT:
         $results = array();
         foreach ($rows as $row) {
           $task = clone $tasks[$row['id']];
           $task->attachGroupByProjectPHID($row['projectGroupPHID']);
           $results[] = $task;
         }
         $tasks = $results;
         break;
     }
 
     return $tasks;
   }
 
   protected function willFilterPage(array $tasks) {
     if ($this->groupBy == self::GROUP_PROJECT) {
       // We should only return project groups which the user can actually see.
       $project_phids = mpull($tasks, 'getGroupByProjectPHID');
       $projects = id(new PhabricatorProjectQuery())
         ->setViewer($this->getViewer())
         ->withPHIDs($project_phids)
         ->execute();
       $projects = mpull($projects, null, 'getPHID');
 
       foreach ($tasks as $key => $task) {
         if (!$task->getGroupByProjectPHID()) {
           // This task is either not in any projects, or only in projects
           // which we're ignoring because they're being queried for explicitly.
           continue;
         }
 
         if (empty($projects[$task->getGroupByProjectPHID()])) {
           unset($tasks[$key]);
         }
       }
     }
 
     return $tasks;
   }
 
   private function buildTaskIDsWhereClause(AphrontDatabaseConnection $conn) {
     if (!$this->taskIDs) {
       return null;
     }
 
     return qsprintf(
       $conn,
       'id in (%Ld)',
       $this->taskIDs);
   }
 
   private function buildTaskPHIDsWhereClause(AphrontDatabaseConnection $conn) {
     if (!$this->taskPHIDs) {
       return null;
     }
 
     return qsprintf(
       $conn,
       'phid in (%Ls)',
       $this->taskPHIDs);
   }
 
   private function buildStatusWhereClause(AphrontDatabaseConnection $conn) {
-
     static $map = array(
       self::STATUS_RESOLVED   => ManiphestTaskStatus::STATUS_CLOSED_RESOLVED,
       self::STATUS_WONTFIX    => ManiphestTaskStatus::STATUS_CLOSED_WONTFIX,
       self::STATUS_INVALID    => ManiphestTaskStatus::STATUS_CLOSED_INVALID,
       self::STATUS_SPITE      => ManiphestTaskStatus::STATUS_CLOSED_SPITE,
       self::STATUS_DUPLICATE  => ManiphestTaskStatus::STATUS_CLOSED_DUPLICATE,
     );
 
     switch ($this->status) {
       case self::STATUS_ANY:
         return null;
       case self::STATUS_OPEN:
         return qsprintf(
           $conn,
           'status IN (%Ls)',
           ManiphestTaskStatus::getOpenStatusConstants());
       case self::STATUS_CLOSED:
         return qsprintf(
           $conn,
           'status IN (%Ls)',
           ManiphestTaskStatus::getClosedStatusConstants());
       default:
         $constant = idx($map, $this->status);
         if (!$constant) {
           throw new Exception("Unknown status query '{$this->status}'!");
         }
         return qsprintf(
           $conn,
           'status = %s',
           $constant);
     }
   }
 
   private function buildStatusesWhereClause(AphrontDatabaseConnection $conn) {
     if ($this->statuses) {
       return qsprintf(
         $conn,
         'status IN (%Ls)',
         $this->statuses);
     }
     return null;
   }
 
   private function buildPrioritiesWhereClause(AphrontDatabaseConnection $conn) {
     if ($this->priorities) {
       return qsprintf(
         $conn,
         'priority IN (%Ld)',
         $this->priorities);
     }
 
     return null;
   }
 
-
   private function buildAuthorWhereClause(AphrontDatabaseConnection $conn) {
     if (!$this->authorPHIDs) {
       return null;
     }
 
     return qsprintf(
       $conn,
       'authorPHID in (%Ls)',
       $this->authorPHIDs);
   }
 
   private function buildOwnerWhereClause(AphrontDatabaseConnection $conn) {
     if (!$this->ownerPHIDs) {
       if ($this->includeUnowned === null) {
         return null;
       } else if ($this->includeUnowned) {
         return qsprintf(
           $conn,
           'ownerPHID IS NULL');
       } else {
         return qsprintf(
           $conn,
           'ownerPHID IS NOT NULL');
       }
     }
 
     if ($this->includeUnowned) {
       return qsprintf(
         $conn,
         'ownerPHID IN (%Ls) OR ownerPHID IS NULL',
         $this->ownerPHIDs);
     } else {
       return qsprintf(
         $conn,
         'ownerPHID IN (%Ls)',
         $this->ownerPHIDs);
     }
   }
 
   private function buildFullTextWhereClause(AphrontDatabaseConnection $conn) {
     if (!strlen($this->fullTextSearch)) {
       return null;
     }
 
     // In doing a fulltext search, we first find all the PHIDs that match the
     // fulltext search, and then use that to limit the rest of the search
     $fulltext_query = id(new PhabricatorSavedQuery())
       ->setEngineClassName('PhabricatorSearchApplicationSearchEngine')
       ->setParameter('query', $this->fullTextSearch);
 
     // NOTE: Setting this to something larger than 2^53 will raise errors in
     // ElasticSearch, and billions of results won't fit in memory anyway.
     $fulltext_query->setParameter('limit', 100000);
     $fulltext_query->setParameter('type', ManiphestPHIDTypeTask::TYPECONST);
 
     $engine = PhabricatorSearchEngineSelector::newSelector()->newEngine();
     $fulltext_results = $engine->executeSearch($fulltext_query);
 
     if (empty($fulltext_results)) {
       $fulltext_results = array(null);
     }
 
     return qsprintf(
       $conn,
       'phid IN (%Ls)',
       $fulltext_results);
   }
 
   private function buildSubscriberWhereClause(AphrontDatabaseConnection $conn) {
     if (!$this->subscriberPHIDs) {
       return null;
     }
 
     return qsprintf(
       $conn,
       'subscriber.subscriberPHID IN (%Ls)',
       $this->subscriberPHIDs);
   }
 
   private function buildProjectWhereClause(AphrontDatabaseConnection $conn) {
     if (!$this->projectPHIDs && !$this->includeNoProject) {
       return null;
     }
 
     $parts = array();
     if ($this->projectPHIDs) {
       $parts[] = qsprintf(
         $conn,
         'project.projectPHID in (%Ls)',
         $this->projectPHIDs);
     }
     if ($this->includeNoProject) {
       $parts[] = qsprintf(
         $conn,
         'project.projectPHID IS NULL');
     }
 
     return '('.implode(') OR (', $parts).')';
   }
 
   private function buildAnyProjectWhereClause(AphrontDatabaseConnection $conn) {
     if (!$this->anyProjectPHIDs) {
       return null;
     }
 
     return qsprintf(
       $conn,
       'anyproject.projectPHID IN (%Ls)',
       $this->anyProjectPHIDs);
   }
 
   private function buildAnyUserProjectWhereClause(
     AphrontDatabaseConnection $conn) {
     if (!$this->anyUserProjectPHIDs) {
       return null;
     }
 
     $projects = id(new PhabricatorProjectQuery())
       ->setViewer($this->getViewer())
       ->withMemberPHIDs($this->anyUserProjectPHIDs)
       ->execute();
     $any_user_project_phids = mpull($projects, 'getPHID');
     if (!$any_user_project_phids) {
       throw new PhabricatorEmptyQueryException();
     }
 
     return qsprintf(
       $conn,
       'anyproject.projectPHID IN (%Ls)',
       $any_user_project_phids);
   }
 
   private function buildXProjectWhereClause(AphrontDatabaseConnection $conn) {
     if (!$this->xprojectPHIDs) {
       return null;
     }
 
     return qsprintf(
       $conn,
       'xproject.projectPHID IS NULL');
   }
 
   private function buildCustomOrderClause(AphrontDatabaseConnection $conn) {
     $order = array();
 
     switch ($this->groupBy) {
       case self::GROUP_NONE:
         break;
       case self::GROUP_PRIORITY:
         $order[] = 'priority';
         break;
       case self::GROUP_OWNER:
         $order[] = 'ownerOrdering';
         break;
       case self::GROUP_STATUS:
         $order[] = 'status';
         break;
       case self::GROUP_PROJECT:
         $order[] = '<group.project>';
         break;
       default:
         throw new Exception("Unknown group query '{$this->groupBy}'!");
     }
 
     switch ($this->orderBy) {
       case self::ORDER_PRIORITY:
         $order[] = 'priority';
         $order[] = 'subpriority';
         $order[] = 'dateModified';
         break;
       case self::ORDER_CREATED:
         $order[] = 'id';
         break;
       case self::ORDER_MODIFIED:
         $order[] = 'dateModified';
         break;
       case self::ORDER_TITLE:
         $order[] = 'title';
         break;
       default:
         throw new Exception("Unknown order query '{$this->orderBy}'!");
     }
 
     $order = array_unique($order);
 
     if (empty($order)) {
       return null;
     }
 
     $reverse = ($this->getBeforeID() xor $this->getReversePaging());
 
     foreach ($order as $k => $column) {
       switch ($column) {
         case 'subpriority':
         case 'ownerOrdering':
         case 'title':
           if ($reverse) {
             $order[$k] = "task.{$column} DESC";
           } else {
             $order[$k] = "task.{$column} ASC";
           }
           break;
         case '<group.project>':
           // Put "No Project" at the end of the list.
           if ($reverse) {
             $order[$k] =
               'projectGroupName.indexedObjectName IS NULL DESC, '.
               'projectGroupName.indexedObjectName DESC';
           } else {
             $order[$k] =
               'projectGroupName.indexedObjectName IS NULL ASC, '.
               'projectGroupName.indexedObjectName ASC';
           }
           break;
         default:
           if ($reverse) {
             $order[$k] = "task.{$column} ASC";
           } else {
             $order[$k] = "task.{$column} DESC";
           }
           break;
       }
     }
 
     return 'ORDER BY '.implode(', ', $order);
   }
 
   private function buildJoinsClause(AphrontDatabaseConnection $conn_r) {
     $project_dao = new ManiphestTaskProject();
 
     $joins = array();
 
     if ($this->projectPHIDs || $this->includeNoProject) {
       $joins[] = qsprintf(
         $conn_r,
         '%Q JOIN %T project ON project.taskPHID = task.phid',
         ($this->includeNoProject ? 'LEFT' : ''),
         $project_dao->getTableName());
     }
 
     if ($this->anyProjectPHIDs || $this->anyUserProjectPHIDs) {
       $joins[] = qsprintf(
         $conn_r,
         'JOIN %T anyproject ON anyproject.taskPHID = task.phid',
         $project_dao->getTableName());
     }
 
     if ($this->xprojectPHIDs) {
       $joins[] = qsprintf(
         $conn_r,
         'LEFT JOIN %T xproject ON xproject.taskPHID = task.phid
           AND xproject.projectPHID IN (%Ls)',
         $project_dao->getTableName(),
         $this->xprojectPHIDs);
     }
 
     if ($this->subscriberPHIDs) {
       $subscriber_dao = new ManiphestTaskSubscriber();
       $joins[] = qsprintf(
         $conn_r,
         'JOIN %T subscriber ON subscriber.taskPHID = task.phid',
         $subscriber_dao->getTableName());
     }
 
     switch ($this->groupBy) {
       case self::GROUP_PROJECT:
         $ignore_group_phids = $this->getIgnoreGroupedProjectPHIDs();
         if ($ignore_group_phids) {
           $joins[] = qsprintf(
             $conn_r,
             'LEFT JOIN %T projectGroup ON task.phid = projectGroup.taskPHID
               AND projectGroup.projectPHID NOT IN (%Ls)',
             $project_dao->getTableName(),
             $ignore_group_phids);
         } else {
           $joins[] = qsprintf(
             $conn_r,
             'LEFT JOIN %T projectGroup ON task.phid = projectGroup.taskPHID',
             $project_dao->getTableName());
         }
         $joins[] = qsprintf(
           $conn_r,
           'LEFT JOIN %T projectGroupName
             ON projectGroup.projectPHID = projectGroupName.indexedObjectPHID',
           id(new ManiphestNameIndex())->getTableName());
         break;
     }
 
     $joins[] = $this->buildApplicationSearchJoinClause($conn_r);
 
     return implode(' ', $joins);
   }
 
   private function buildGroupClause(AphrontDatabaseConnection $conn_r) {
     $joined_multiple_rows = (count($this->projectPHIDs) > 1) ||
                             (count($this->anyProjectPHIDs) > 1) ||
                             ($this->getApplicationSearchMayJoinMultipleRows());
 
     $joined_project_name = ($this->groupBy == self::GROUP_PROJECT);
 
     // If we're joining multiple rows, we need to group the results by the
     // task IDs.
     if ($joined_multiple_rows) {
       if ($joined_project_name) {
         return 'GROUP BY task.phid, projectGroup.projectPHID';
       } else {
         return 'GROUP BY task.phid';
       }
     } else {
       return '';
     }
   }
 
   /**
    * Return project PHIDs which we should ignore when grouping tasks by
    * project. For example, if a user issues a query like:
    *
    *   Tasks in all projects: Frontend, Bugs
    *
    * ...then we don't show "Frontend" or "Bugs" groups in the result set, since
    * they're meaningless as all results are in both groups.
    *
    * Similarly, for queries like:
    *
    *   Tasks in any projects: Public Relations
    *
    * ...we ignore the single project, as every result is in that project. (In
    * the case that there are several "any" projects, we do not ignore them.)
    *
    * @return list<phid> Project PHIDs which should be ignored in query
    *                    construction.
    */
   private function getIgnoreGroupedProjectPHIDs() {
     $phids = array();
 
     if ($this->projectPHIDs) {
       $phids[] = $this->projectPHIDs;
     }
 
     if (count($this->anyProjectPHIDs) == 1) {
       $phids[] = $this->anyProjectPHIDs;
     }
 
     // Maybe we should also exclude the "excludeProjectPHIDs"? It won't
     // impact the results, but we might end up with a better query plan.
     // Investigate this on real data? This is likely very rare.
 
     return array_mergev($phids);
   }
 
   private function loadCursorObject($id) {
     $results = id(new ManiphestTaskQuery())
       ->setViewer($this->getPagingViewer())
       ->withIDs(array((int)$id))
       ->execute();
     return head($results);
   }
 
   protected function getPagingValue($result) {
     $id = $result->getID();
 
     switch ($this->groupBy) {
       case self::GROUP_NONE:
         return $id;
       case self::GROUP_PRIORITY:
         return $id.'.'.$result->getPriority();
       case self::GROUP_OWNER:
         return rtrim($id.'.'.$result->getOwnerPHID(), '.');
       case self::GROUP_STATUS:
         return $id.'.'.$result->getStatus();
       case self::GROUP_PROJECT:
         return rtrim($id.'.'.$result->getGroupByProjectPHID(), '.');
       default:
         throw new Exception("Unknown group query '{$this->groupBy}'!");
     }
   }
 
   protected function buildPagingClause(AphrontDatabaseConnection $conn_r) {
     $default = parent::buildPagingClause($conn_r);
 
     $before_id = $this->getBeforeID();
     $after_id = $this->getAfterID();
 
     if (!$before_id && !$after_id) {
       return $default;
     }
 
     $cursor_id = nonempty($before_id, $after_id);
     $cursor_parts = explode('.', $cursor_id, 2);
     $task_id = $cursor_parts[0];
     $group_id = idx($cursor_parts, 1);
 
     $cursor = $this->loadCursorObject($task_id);
     if (!$cursor) {
       return null;
     }
 
     $columns = array();
 
     switch ($this->groupBy) {
       case self::GROUP_NONE:
         break;
       case self::GROUP_PRIORITY:
         $columns[] = array(
           'name' => 'task.priority',
           'value' => (int)$group_id,
           'type' => 'int',
         );
         break;
       case self::GROUP_OWNER:
         $columns[] = array(
           'name' => '(task.ownerOrdering IS NULL)',
           'value' => (int)(strlen($group_id) ? 0 : 1),
           'type' => 'int',
         );
         if ($group_id) {
           $paging_users = id(new PhabricatorPeopleQuery())
             ->setViewer($this->getViewer())
             ->withPHIDs(array($group_id))
             ->execute();
           if (!$paging_users) {
             return null;
           }
           $columns[] = array(
             'name' => 'task.ownerOrdering',
             'value' => head($paging_users)->getUsername(),
             'type' => 'string',
             'reverse' => true,
           );
         }
         break;
       case self::GROUP_STATUS:
         $columns[] = array(
           'name' => 'task.status',
           'value' => $group_id,
           'type' => 'string',
         );
         break;
       case self::GROUP_PROJECT:
         $columns[] = array(
           'name' => '(projectGroupName.indexedObjectName IS NULL)',
           'value' => (int)(strlen($group_id) ? 0 : 1),
           'type' => 'int',
         );
         if ($group_id) {
           $paging_projects = id(new PhabricatorProjectQuery())
             ->setViewer($this->getViewer())
             ->withPHIDs(array($group_id))
             ->execute();
           if (!$paging_projects) {
             return null;
           }
           $columns[] = array(
             'name' => 'projectGroupName.indexedObjectName',
             'value' => head($paging_projects)->getName(),
             'type' => 'string',
             'reverse' => true,
           );
         }
         break;
       default:
         throw new Exception("Unknown group query '{$this->groupBy}'!");
     }
 
     switch ($this->orderBy) {
       case self::ORDER_PRIORITY:
         if ($this->groupBy != self::GROUP_PRIORITY) {
           $columns[] = array(
             'name' => 'task.priority',
             'value' => (int)$cursor->getPriority(),
             'type' => 'int',
           );
         }
         $columns[] = array(
           'name' => 'task.subpriority',
           'value' => (int)$cursor->getSubpriority(),
           'type' => 'int',
           'reverse' => true,
         );
         $columns[] = array(
           'name' => 'task.dateModified',
           'value' => (int)$cursor->getDateModified(),
           'type' => 'int',
         );
         break;
       case self::ORDER_CREATED:
         $columns[] = array(
           'name' => 'task.id',
           'value' => (int)$cursor->getID(),
           'type' => 'int',
         );
         break;
       case self::ORDER_MODIFIED:
         $columns[] = array(
           'name' => 'task.dateModified',
           'value' => (int)$cursor->getDateModified(),
           'type' => 'int',
         );
         break;
       case self::ORDER_TITLE:
         $columns[] = array(
           'name' => 'task.title',
           'value' => $cursor->getTitle(),
           'type' => 'string',
         );
         $columns[] = array(
           'name' => 'task.id',
           'value' => $cursor->getID(),
           'type' => 'int',
         );
         break;
       default:
         throw new Exception("Unknown order query '{$this->orderBy}'!");
     }
 
     return $this->buildPagingClauseFromMultipleColumns(
       $conn_r,
       $columns,
       array(
         'reversed' => (bool)($before_id xor $this->getReversePaging()),
       ));
   }
 
   protected function getApplicationSearchObjectPHIDColumn() {
     return 'task.phid';
   }
 
-
   public function getQueryApplicationClass() {
     return 'PhabricatorApplicationManiphest';
   }
 
 }
diff --git a/src/applications/maniphest/remarkup/ManiphestRemarkupRule.php b/src/applications/maniphest/remarkup/ManiphestRemarkupRule.php
index e3bb9200a4..be3921cc5d 100644
--- a/src/applications/maniphest/remarkup/ManiphestRemarkupRule.php
+++ b/src/applications/maniphest/remarkup/ManiphestRemarkupRule.php
@@ -1,22 +1,18 @@
 <?php
 
-/**
- * @group maniphest
- */
-final class ManiphestRemarkupRule
-  extends PhabricatorRemarkupRuleObject {
+final class ManiphestRemarkupRule extends PhabricatorRemarkupRuleObject {
 
   protected function getObjectNamePrefix() {
     return 'T';
   }
 
   protected function loadObjects(array $ids) {
     $viewer = $this->getEngine()->getConfig('viewer');
 
     return id(new ManiphestTaskQuery())
       ->setViewer($viewer)
       ->withIDs($ids)
       ->execute();
   }
 
 }
diff --git a/src/applications/maniphest/search/ManiphestSearchIndexer.php b/src/applications/maniphest/search/ManiphestSearchIndexer.php
index 9e88ccb267..67befa46bd 100644
--- a/src/applications/maniphest/search/ManiphestSearchIndexer.php
+++ b/src/applications/maniphest/search/ManiphestSearchIndexer.php
@@ -1,86 +1,83 @@
 <?php
 
-/**
- * @group maniphest
- */
-final class ManiphestSearchIndexer
-  extends PhabricatorSearchDocumentIndexer {
+final class ManiphestSearchIndexer extends PhabricatorSearchDocumentIndexer {
 
   public function getIndexableObject() {
     return new ManiphestTask();
   }
 
   protected function buildAbstractDocumentByPHID($phid) {
     $task = $this->loadDocumentByPHID($phid);
 
     $doc = new PhabricatorSearchAbstractDocument();
     $doc->setPHID($task->getPHID());
     $doc->setDocumentType(ManiphestPHIDTypeTask::TYPECONST);
     $doc->setDocumentTitle($task->getTitle());
     $doc->setDocumentCreated($task->getDateCreated());
     $doc->setDocumentModified($task->getDateModified());
 
     $doc->addField(
       PhabricatorSearchField::FIELD_BODY,
       $task->getDescription());
 
     $doc->addRelationship(
       PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
       $task->getAuthorPHID(),
       PhabricatorPeoplePHIDTypeUser::TYPECONST,
       $task->getDateCreated());
 
     $doc->addRelationship(
       $task->isClosed()
         ? PhabricatorSearchRelationship::RELATIONSHIP_CLOSED
         : PhabricatorSearchRelationship::RELATIONSHIP_OPEN,
       $task->getPHID(),
       ManiphestPHIDTypeTask::TYPECONST,
       time());
 
     $this->indexTransactions(
       $doc,
       new ManiphestTransactionQuery(),
       array($phid));
 
     foreach ($task->getProjectPHIDs() as $phid) {
       $doc->addRelationship(
         PhabricatorSearchRelationship::RELATIONSHIP_PROJECT,
         $phid,
         PhabricatorProjectPHIDTypeProject::TYPECONST,
         $task->getDateModified()); // Bogus.
     }
 
     $owner = $task->getOwnerPHID();
     if ($owner) {
       $doc->addRelationship(
         PhabricatorSearchRelationship::RELATIONSHIP_OWNER,
         $owner,
         PhabricatorPeoplePHIDTypeUser::TYPECONST,
         time());
     } else {
       $doc->addRelationship(
         PhabricatorSearchRelationship::RELATIONSHIP_UNOWNED,
         $task->getPHID(),
         PhabricatorPHIDConstants::PHID_TYPE_VOID,
         $task->getDateCreated());
     }
 
     // We need to load handles here since non-users may subscribe (mailing
     // lists, e.g.)
     $ccs = $task->getCCPHIDs();
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withPHIDs($ccs)
       ->execute();
     foreach ($ccs as $cc) {
       $doc->addRelationship(
         PhabricatorSearchRelationship::RELATIONSHIP_SUBSCRIBER,
         $handles[$cc]->getPHID(),
         $handles[$cc]->getType(),
         time());
     }
 
     return $doc;
   }
+
 }
diff --git a/src/applications/maniphest/storage/ManiphestDAO.php b/src/applications/maniphest/storage/ManiphestDAO.php
index c72524a3d2..a1a3e1b89d 100644
--- a/src/applications/maniphest/storage/ManiphestDAO.php
+++ b/src/applications/maniphest/storage/ManiphestDAO.php
@@ -1,12 +1,9 @@
 <?php
 
-/**
- * @group maniphest
- */
 abstract class ManiphestDAO extends PhabricatorLiskDAO {
 
   public function getApplicationName() {
     return 'maniphest';
   }
 
 }
diff --git a/src/applications/maniphest/storage/ManiphestTaskProject.php b/src/applications/maniphest/storage/ManiphestTaskProject.php
index 546a296071..f26627a01b 100644
--- a/src/applications/maniphest/storage/ManiphestTaskProject.php
+++ b/src/applications/maniphest/storage/ManiphestTaskProject.php
@@ -1,51 +1,49 @@
 <?php
 
 /**
  * This is a DAO for the Task -> Project table, which denormalizes the
  * relationship between tasks and projects into a link table so it can be
  * efficiently queried. This table is not authoritative; the projectPHIDs field
  * of ManiphestTask is. The rows in this table are regenerated when transactions
  * are applied to tasks which affected their associated projects.
- *
- * @group maniphest
  */
 final class ManiphestTaskProject extends ManiphestDAO {
 
   protected $taskPHID;
   protected $projectPHID;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_IDS          => self::IDS_MANUAL,
       self::CONFIG_TIMESTAMPS   => false,
     );
   }
 
   public static function updateTaskProjects(ManiphestTask $task) {
     $dao = new ManiphestTaskProject();
     $conn = $dao->establishConnection('w');
 
     $sql = array();
     foreach ($task->getProjectPHIDs() as $project_phid) {
       $sql[] = qsprintf(
         $conn,
         '(%s, %s)',
         $task->getPHID(),
         $project_phid);
     }
 
     queryfx(
       $conn,
       'DELETE FROM %T WHERE taskPHID = %s',
       $dao->getTableName(),
       $task->getPHID());
     if ($sql) {
       queryfx(
         $conn,
         'INSERT INTO %T (taskPHID, projectPHID) VALUES %Q',
         $dao->getTableName(),
         implode(', ', $sql));
     }
   }
 
 }
diff --git a/src/applications/maniphest/storage/ManiphestTaskSubscriber.php b/src/applications/maniphest/storage/ManiphestTaskSubscriber.php
index f0b45f905b..54e1cce418 100644
--- a/src/applications/maniphest/storage/ManiphestTaskSubscriber.php
+++ b/src/applications/maniphest/storage/ManiphestTaskSubscriber.php
@@ -1,49 +1,46 @@
 <?php
 
-/**
- * @group maniphest
- */
 final class ManiphestTaskSubscriber extends ManiphestDAO {
 
   protected $taskPHID;
   protected $subscriberPHID;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_IDS          => self::IDS_MANUAL,
       self::CONFIG_TIMESTAMPS   => false,
     );
   }
 
   public static function updateTaskSubscribers(ManiphestTask $task) {
     $dao = new ManiphestTaskSubscriber();
     $conn = $dao->establishConnection('w');
 
     $sql = array();
     $subscribers = $task->getCCPHIDs();
     $subscribers[] = $task->getOwnerPHID();
     $subscribers = array_unique($subscribers);
 
     foreach ($subscribers as $subscriber_phid) {
       $sql[] = qsprintf(
         $conn,
         '(%s, %s)',
         $task->getPHID(),
         $subscriber_phid);
     }
 
     queryfx(
       $conn,
       'DELETE FROM %T WHERE taskPHID = %s',
       $dao->getTableName(),
       $task->getPHID());
     if ($sql) {
       queryfx(
         $conn,
         'INSERT INTO %T (taskPHID, subscriberPHID) VALUES %Q',
         $dao->getTableName(),
         implode(', ', $sql));
     }
   }
 
 }
diff --git a/src/applications/maniphest/view/ManiphestTaskListView.php b/src/applications/maniphest/view/ManiphestTaskListView.php
index 959359faa1..896f2bfa02 100644
--- a/src/applications/maniphest/view/ManiphestTaskListView.php
+++ b/src/applications/maniphest/view/ManiphestTaskListView.php
@@ -1,135 +1,132 @@
 <?php
 
-/**
- * @group maniphest
- */
 final class ManiphestTaskListView extends ManiphestView {
 
   private $tasks;
   private $handles;
   private $showBatchControls;
   private $showSubpriorityControls;
 
   public function setTasks(array $tasks) {
     assert_instances_of($tasks, 'ManiphestTask');
     $this->tasks = $tasks;
     return $this;
   }
 
   public function setHandles(array $handles) {
     assert_instances_of($handles, 'PhabricatorObjectHandle');
     $this->handles = $handles;
     return $this;
   }
 
   public function setShowBatchControls($show_batch_controls) {
     $this->showBatchControls = $show_batch_controls;
     return $this;
   }
 
   public function setShowSubpriorityControls($show_subpriority_controls) {
     $this->showSubpriorityControls = $show_subpriority_controls;
     return $this;
   }
 
   public function render() {
     $handles = $this->handles;
 
     require_celerity_resource('maniphest-task-summary-css');
 
     $list = new PHUIObjectItemListView();
     $list->setFlush(true);
 
     $status_map = ManiphestTaskStatus::getTaskStatusMap();
     $color_map = ManiphestTaskPriority::getColorMap();
 
     if ($this->showBatchControls) {
       Javelin::initBehavior('maniphest-list-editor');
     }
 
     foreach ($this->tasks as $task) {
       $item = new PHUIObjectItemView();
       $item->setObjectName('T'.$task->getID());
       $item->setHeader($task->getTitle());
       $item->setHref('/T'.$task->getID());
 
       if ($task->getOwnerPHID()) {
         $owner = $handles[$task->getOwnerPHID()];
         $item->addByline(pht('Assigned: %s', $owner->renderLink()));
       }
 
       $status = $task->getStatus();
       if ($task->isClosed()) {
         $item->setDisabled(true);
       }
 
       $item->setBarColor(idx($color_map, $task->getPriority(), 'grey'));
 
       $item->addIcon(
         'none',
         phabricator_datetime($task->getDateModified(), $this->getUser()));
 
       if ($this->showSubpriorityControls) {
         $item->setGrippable(true);
       }
       if ($this->showSubpriorityControls || $this->showBatchControls) {
         $item->addSigil('maniphest-task');
       }
 
       $project_handles = array_select_keys(
         $handles,
         $task->getProjectPHIDs());
 
       $item->addAttribute(
         id(new PHUIHandleTagListView())
           ->setLimit(4)
           ->setNoDataString(pht('No Projects'))
           ->setSlim(true)
           ->setHandles($project_handles));
 
       $item->setMetadata(
         array(
           'taskID' => $task->getID(),
         ));
 
       if ($this->showBatchControls) {
         $item->addAction(
           id(new PHUIListItemView())
             ->setIcon('fa-pencil')
             ->addSigil('maniphest-edit-task')
             ->setHref('/maniphest/task/edit/'.$task->getID().'/'));
       }
 
       $list->addItem($item);
     }
 
     return $list;
   }
 
   public static function loadTaskHandles(
     PhabricatorUser $viewer,
     array $tasks) {
     assert_instances_of($tasks, 'ManiphestTask');
 
     $phids = array();
     foreach ($tasks as $task) {
       $assigned_phid = $task->getOwnerPHID();
       if ($assigned_phid) {
         $phids[] = $assigned_phid;
       }
       foreach ($task->getProjectPHIDs() as $project_phid) {
         $phids[] = $project_phid;
       }
     }
 
     if (!$phids) {
       return array();
     }
 
     return id(new PhabricatorHandleQuery())
       ->setViewer($viewer)
       ->withPHIDs($phids)
       ->execute();
   }
 
 }
diff --git a/src/applications/metamta/view/PhabricatorMetaMTAMailBody.php b/src/applications/metamta/view/PhabricatorMetaMTAMailBody.php
index e23b991605..4875135dc4 100644
--- a/src/applications/metamta/view/PhabricatorMetaMTAMailBody.php
+++ b/src/applications/metamta/view/PhabricatorMetaMTAMailBody.php
@@ -1,141 +1,140 @@
 <?php
 
 /**
  * Render the body of an application email by building it up section-by-section.
  *
  * @task compose  Composition
  * @task render   Rendering
- * @group metamta
  */
 final class PhabricatorMetaMTAMailBody {
 
   private $sections = array();
   private $attachments = array();
 
 
 /* -(  Composition  )-------------------------------------------------------- */
 
 
   /**
    * Add a raw block of text to the email. This will be rendered as-is.
    *
    * @param string Block of text.
    * @return this
    * @task compose
    */
   public function addRawSection($text) {
     if (strlen($text)) {
       $this->sections[] = rtrim($text);
     }
     return $this;
   }
 
 
   /**
    * Add a block of text with a section header. This is rendered like this:
    *
    *    HEADER
    *      Text is indented.
    *
    * @param string Header text.
    * @param string Section text.
    * @return this
    * @task compose
    */
   public function addTextSection($header, $text) {
     $this->sections[] = $header."\n".$this->indent($text);
     return $this;
   }
 
 
   /**
    * Add a Herald section with a rule management URI and a transcript URI.
    *
    * @param string URI to rule transcripts.
    * @return this
    * @task compose
    */
   public function addHeraldSection($xscript_uri) {
     if (!PhabricatorEnv::getEnvConfig('metamta.herald.show-hints')) {
       return $this;
     }
 
     $this->addTextSection(
       pht('WHY DID I GET THIS EMAIL?'),
       PhabricatorEnv::getProductionURI($xscript_uri));
 
     return $this;
   }
 
 
   /**
    * Add a section with reply handler instructions.
    *
    * @param string Reply handler instructions.
    * @return this
    * @task compose
    */
   public function addReplySection($instructions) {
     if (!PhabricatorEnv::getEnvConfig('metamta.reply.show-hints')) {
       return $this;
     }
     if (!strlen($instructions)) {
       return $this;
     }
 
     $this->addTextSection(pht('REPLY HANDLER ACTIONS'), $instructions);
 
     return $this;
   }
 
 
   /**
    * Add an attachment.
    *
    * @param PhabricatorMetaMTAAttachment Attachment.
    * @return this
    * @task compose
    */
   public function addAttachment(PhabricatorMetaMTAAttachment $attachment) {
     $this->attachments[] = $attachment;
     return $this;
   }
 
 
 /* -(  Rendering  )---------------------------------------------------------- */
 
 
   /**
    * Render the email body.
    *
    * @return string Rendered body.
    * @task render
    */
   public function render() {
     return implode("\n\n", $this->sections)."\n";
   }
 
 
   /**
    * Retrieve attachments.
    *
    * @return list<PhabricatorMetaMTAAttachment> Attachments.
    * @task render
    */
   public function getAttachments() {
     return $this->attachments;
   }
 
 
   /**
    * Indent a block of text for rendering under a section heading.
    *
    * @param string Text to indent.
    * @return string Indented text.
    * @task render
    */
   private function indent($text) {
     return rtrim("  ".str_replace("\n", "\n  ", $text));
   }
 
 }
diff --git a/src/applications/metamta/view/__tests__/PhabricatorMetaMTAMailBodyTestCase.php b/src/applications/metamta/view/__tests__/PhabricatorMetaMTAMailBodyTestCase.php
index f7579fc89a..021dd504dd 100644
--- a/src/applications/metamta/view/__tests__/PhabricatorMetaMTAMailBodyTestCase.php
+++ b/src/applications/metamta/view/__tests__/PhabricatorMetaMTAMailBodyTestCase.php
@@ -1,78 +1,72 @@
 <?php
 
-/**
- * @group metamta
- */
 final class PhabricatorMetaMTAMailBodyTestCase extends PhabricatorTestCase {
 
-
   public function testBodyRender() {
     $expect = <<<EOTEXT
 salmon
 
 HEADER
   bass
   trout
 
 WHY DID I GET THIS EMAIL?
   http://test.com/xscript/
 
 REPLY HANDLER ACTIONS
   pike
 
 EOTEXT;
 
     $this->assertEmail($expect, true, true);
   }
 
-
   public function testBodyRenderNoHerald() {
     $expect = <<<EOTEXT
 salmon
 
 HEADER
   bass
   trout
 
 REPLY HANDLER ACTIONS
   pike
 
 EOTEXT;
 
     $this->assertEmail($expect, false, true);
   }
 
 
   public function testBodyRenderNoReply() {
     $expect = <<<EOTEXT
 salmon
 
 HEADER
   bass
   trout
 
 WHY DID I GET THIS EMAIL?
   http://test.com/xscript/
 
 EOTEXT;
 
     $this->assertEmail($expect, true, false);
   }
 
   private function assertEmail($expect, $herald_hints, $reply_hints) {
     $env = PhabricatorEnv::beginScopedEnv();
     $env->overrideEnvConfig('phabricator.production-uri', 'http://test.com/');
     $env->overrideEnvConfig('metamta.herald.show-hints', $herald_hints);
     $env->overrideEnvConfig('metamta.reply.show-hints', $reply_hints);
 
     $body = new PhabricatorMetaMTAMailBody();
     $body->addRawSection('salmon');
     $body->addTextSection('HEADER', "bass\ntrout\n");
     $body->addHeraldSection('/xscript/');
     $body->addReplySection('pike');
 
     $this->assertEqual($expect, $body->render());
   }
 
-
 }
diff --git a/src/applications/nuance/conduit/ConduitAPI_nuance_Method.php b/src/applications/nuance/conduit/ConduitAPI_nuance_Method.php
index 38a58dbdc7..374ae7e4eb 100644
--- a/src/applications/nuance/conduit/ConduitAPI_nuance_Method.php
+++ b/src/applications/nuance/conduit/ConduitAPI_nuance_Method.php
@@ -1,17 +1,14 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class ConduitAPI_nuance_Method extends ConduitAPIMethod {
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
       'PhabricatorApplicationNuance');
   }
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
 }
diff --git a/src/applications/nuance/conduit/ConduitAPI_nuance_createitem_Method.php b/src/applications/nuance/conduit/ConduitAPI_nuance_createitem_Method.php
index daf86124b6..226b351146 100644
--- a/src/applications/nuance/conduit/ConduitAPI_nuance_createitem_Method.php
+++ b/src/applications/nuance/conduit/ConduitAPI_nuance_createitem_Method.php
@@ -1,73 +1,70 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_nuance_createitem_Method
   extends ConduitAPI_nuance_Method {
 
   public function getMethodDescription() {
     return pht('Create a new item.');
   }
 
   public function defineParamTypes() {
     return array(
       'requestorPHID' => 'required string',
       'sourcePHID'    => 'required string',
       'ownerPHID'     => 'optional string',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-NO-REQUESTOR-PHID' => pht('Items must have a requestor.'),
       'ERR-NO-SOURCE-PHID' => pht('Items must have a source.'),
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $source_phid = $request->getValue('sourcePHID');
     $owner_phid = $request->getValue('ownerPHID');
     $requestor_phid = $request->getValue('requestorPHID');
 
     $user = $request->getUser();
 
     $item = NuanceItem::initializeNewItem($user);
     $xactions = array();
 
     if ($source_phid) {
       $xactions[] = id(new NuanceItemTransaction())
         ->setTransactionType(NuanceItemTransaction::TYPE_SOURCE)
         ->setNewValue($source_phid);
     } else {
       throw new ConduitException('ERR-NO-SOURCE-PHID');
     }
 
     if ($owner_phid) {
       $xactions[] = id(new NuanceItemTransaction())
         ->setTransactionType(NuanceItemTransaction::TYPE_OWNER)
         ->setNewValue($owner_phid);
     }
 
     if ($requestor_phid) {
       $xactions[] = id(new NuanceItemTransaction())
         ->setTransactionType(NuanceItemTransaction::TYPE_REQUESTOR)
         ->setNewValue($requestor_phid);
     } else {
       throw new ConduitException('ERR-NO-REQUESTOR-PHID');
     }
 
     $source = PhabricatorContentSource::newFromConduitRequest($request);
     $editor = id(new NuanceItemEditor())
       ->setActor($user)
       ->setContentSource($source)
       ->applyTransactions($item, $xactions);
 
     return $item->toDictionary();
   }
 
 }
diff --git a/src/applications/oauthserver/PhabricatorOAuthResponse.php b/src/applications/oauthserver/PhabricatorOAuthResponse.php
index e51b1d45d8..4e2c86c861 100644
--- a/src/applications/oauthserver/PhabricatorOAuthResponse.php
+++ b/src/applications/oauthserver/PhabricatorOAuthResponse.php
@@ -1,107 +1,107 @@
 <?php
 
-/*
-* @group oauthserver
-*/
 final class PhabricatorOAuthResponse extends AphrontResponse {
 
   private $state;
   private $content;
   private $clientURI;
   private $error;
   private $errorDescription;
 
   private function getState() {
     return $this->state;
   }
   public function setState($state) {
     $this->state = $state;
     return $this;
   }
 
   private function getContent() {
     return $this->content;
   }
   public function setContent($content) {
     $this->content = $content;
     return $this;
   }
 
   private function getClientURI() {
     return $this->clientURI;
   }
   public function setClientURI(PhutilURI $uri) {
     $this->setHTTPResponseCode(302);
     $this->clientURI = $uri;
     return $this;
   }
   private function getFullURI() {
     $base_uri     = $this->getClientURI();
     $query_params = $this->buildResponseDict();
     foreach ($query_params as $key => $value) {
       $base_uri->setQueryParam($key, $value);
     }
     return $base_uri;
   }
 
   private function getError() {
     return $this->error;
   }
+
   public function setError($error) {
     // errors sometimes redirect to the client (302) but otherwise
     // the spec says all code 400
     if (!$this->getClientURI()) {
       $this->setHTTPResponseCode(400);
     }
     $this->error = $error;
     return $this;
   }
 
   private function getErrorDescription() {
     return $this->errorDescription;
   }
+
   public function setErrorDescription($error_description) {
     $this->errorDescription = $error_description;
     return $this;
   }
 
   public function __construct() {
     $this->setHTTPResponseCode(200);      // assume the best
     return $this;
   }
 
   public function getHeaders() {
     $headers = array(
       array('Content-Type', 'application/json'),
     );
     if ($this->getClientURI()) {
       $headers[] = array('Location', $this->getFullURI());
     }
     // TODO -- T844 set headers with X-Auth-Scopes, etc
     $headers = array_merge(parent::getHeaders(), $headers);
     return $headers;
   }
 
   private function buildResponseDict() {
     if ($this->getError()) {
       $content = array(
         'error'             => $this->getError(),
         'error_description' => $this->getErrorDescription(),
       );
       $this->setContent($content);
     }
 
     $content = $this->getContent();
     if (!$content) {
       return '';
     }
     if ($this->getState()) {
       $content['state'] = $this->getState();
     }
     return $content;
   }
 
   public function buildResponseString() {
     return $this->encodeJSONForHTTPResponse($this->buildResponseDict());
   }
+
 }
diff --git a/src/applications/oauthserver/PhabricatorOAuthServer.php b/src/applications/oauthserver/PhabricatorOAuthServer.php
index 2180e53967..a903c554f5 100644
--- a/src/applications/oauthserver/PhabricatorOAuthServer.php
+++ b/src/applications/oauthserver/PhabricatorOAuthServer.php
@@ -1,270 +1,262 @@
 <?php
 
 /**
  * Implements core OAuth 2.0 Server logic.
  *
  * This class should be used behind business logic that parses input to
  * determine pertinent @{class:PhabricatorUser} $user,
  * @{class:PhabricatorOAuthServerClient} $client(s),
  * @{class:PhabricatorOAuthServerAuthorizationCode} $code(s), and.
  * @{class:PhabricatorOAuthServerAccessToken} $token(s).
  *
  * For an OAuth 2.0 server, there are two main steps:
  *
  * 1) Authorization - the user authorizes a given client to access the data
- * the OAuth 2.0 server protects.  Once this is achieved / if it has
+ * the OAuth 2.0 server protects. Once this is achieved / if it has
  * been achived already, the OAuth server sends the client an authorization
  * code.
  * 2) Access Token - the client should send the authorization code received in
  * step 1 along with its id and secret to the OAuth server to receive an
- * access token.  This access token can later be used to access Phabricator
+ * access token. This access token can later be used to access Phabricator
  * data on behalf of the user.
  *
  * @task auth Authorizing @{class:PhabricatorOAuthServerClient}s and
  *            generating @{class:PhabricatorOAuthServerAuthorizationCode}s
  * @task token Validating @{class:PhabricatorOAuthServerAuthorizationCode}s
  *             and generating @{class:PhabricatorOAuthServerAccessToken}s
  * @task internal Internals
- *
- * @group oauthserver
  */
 final class PhabricatorOAuthServer {
 
   const AUTHORIZATION_CODE_TIMEOUT = 300;
   const ACCESS_TOKEN_TIMEOUT       = 3600;
 
   private $user;
   private $client;
 
-  /**
-   * @group internal
-   */
   private function getUser() {
     if (!$this->user) {
       throw new Exception('You must setUser before you can getUser!');
     }
     return $this->user;
   }
 
   public function setUser(PhabricatorUser $user) {
     $this->user = $user;
     return $this;
   }
 
-  /**
-   * @group internal
-   */
   private function getClient() {
     if (!$this->client) {
       throw new Exception('You must setClient before you can getClient!');
     }
     return $this->client;
   }
 
   public function setClient(PhabricatorOAuthServerClient $client) {
     $this->client = $client;
     return $this;
   }
 
   /**
    * @task auth
    * @return tuple <bool hasAuthorized, ClientAuthorization or null>
    */
   public function userHasAuthorizedClient(array $scope) {
 
     $authorization = id(new PhabricatorOAuthClientAuthorization())->
       loadOneWhere('userPHID = %s AND clientPHID = %s',
                    $this->getUser()->getPHID(),
                    $this->getClient()->getPHID());
     if (empty($authorization)) {
       return array(false, null);
     }
 
     if ($scope) {
       $missing_scope = array_diff_key($scope,
                                       $authorization->getScope());
     } else {
       $missing_scope = false;
     }
 
     if ($missing_scope) {
       return array(false, $authorization);
     }
 
     return array(true, $authorization);
   }
 
   /**
    * @task auth
    */
   public function authorizeClient(array $scope) {
     $authorization = new PhabricatorOAuthClientAuthorization();
     $authorization->setUserPHID($this->getUser()->getPHID());
     $authorization->setClientPHID($this->getClient()->getPHID());
     $authorization->setScope($scope);
     $authorization->save();
 
     return $authorization;
   }
 
   /**
    * @task auth
    */
   public function generateAuthorizationCode(PhutilURI $redirect_uri) {
 
     $code   = Filesystem::readRandomCharacters(32);
     $client = $this->getClient();
 
     $authorization_code = new PhabricatorOAuthServerAuthorizationCode();
     $authorization_code->setCode($code);
     $authorization_code->setClientPHID($client->getPHID());
     $authorization_code->setClientSecret($client->getSecret());
     $authorization_code->setUserPHID($this->getUser()->getPHID());
     $authorization_code->setRedirectURI((string) $redirect_uri);
     $authorization_code->save();
 
     return $authorization_code;
   }
 
   /**
    * @task token
    */
   public function generateAccessToken() {
 
     $token = Filesystem::readRandomCharacters(32);
 
     $access_token = new PhabricatorOAuthServerAccessToken();
     $access_token->setToken($token);
     $access_token->setUserPHID($this->getUser()->getPHID());
     $access_token->setClientPHID($this->getClient()->getPHID());
     $access_token->save();
 
     return $access_token;
   }
 
   /**
    * @task token
    */
   public function validateAuthorizationCode(
     PhabricatorOAuthServerAuthorizationCode $test_code,
     PhabricatorOAuthServerAuthorizationCode $valid_code) {
 
     // check that all the meta data matches
     if ($test_code->getClientPHID() != $valid_code->getClientPHID()) {
       return false;
     }
     if ($test_code->getClientSecret() != $valid_code->getClientSecret()) {
       return false;
     }
 
     // check that the authorization code hasn't timed out
     $created_time = $test_code->getDateCreated();
     $must_be_used_by = $created_time + self::AUTHORIZATION_CODE_TIMEOUT;
     return (time() < $must_be_used_by);
   }
 
   /**
    * @task token
    */
   public function validateAccessToken(
     PhabricatorOAuthServerAccessToken $token,
     $required_scope) {
 
     $created_time    = $token->getDateCreated();
     $must_be_used_by = $created_time + self::ACCESS_TOKEN_TIMEOUT;
     $expired         = time() > $must_be_used_by;
     $authorization   = id(new PhabricatorOAuthClientAuthorization())
                          ->loadOneWhere(
                            'userPHID = %s AND clientPHID = %s',
                            $token->getUserPHID(),
                            $token->getClientPHID());
 
     if (!$authorization) {
       return false;
     }
     $token_scope = $authorization->getScope();
     if (!isset($token_scope[$required_scope])) {
       return false;
     }
 
     $valid = true;
     if ($expired) {
       $valid = false;
       // check if the scope includes "offline_access", which makes the
       // token valid despite being expired
       if (isset(
         $token_scope[PhabricatorOAuthServerScope::SCOPE_OFFLINE_ACCESS])) {
         $valid = true;
       }
     }
 
     return $valid;
   }
 
   /**
    * See http://tools.ietf.org/html/draft-ietf-oauth-v2-23#section-3.1.2
    * for details on what makes a given redirect URI "valid".
    */
   public function validateRedirectURI(PhutilURI $uri) {
     if (!PhabricatorEnv::isValidRemoteWebResource($uri)) {
       return false;
     }
 
     if ($uri->getFragment()) {
       return false;
     }
 
     if (!$uri->getDomain()) {
       return false;
     }
 
     return true;
   }
 
   /**
    * If there's a URI specified in an OAuth request, it must be validated in
    * its own right. Further, it must have the same domain and (at least) the
    * same query parameters as the primary URI.
    */
   public function validateSecondaryRedirectURI(
     PhutilURI $secondary_uri,
     PhutilURI $primary_uri) {
 
     // The secondary URI must be valid.
     if (!$this->validateRedirectURI($secondary_uri)) {
       return false;
     }
 
     // Both URIs must point at the same domain.
     if ($secondary_uri->getDomain() != $primary_uri->getDomain()) {
       return false;
     }
 
     // Any query parameters present in the first URI must be exactly present
     // in the second URI.
     $need_params = $primary_uri->getQueryParams();
     $have_params = $secondary_uri->getQueryParams();
 
     foreach ($need_params as $key => $value) {
       if (!array_key_exists($key, $have_params)) {
         return false;
       }
       if ((string)$have_params[$key] != (string)$value) {
         return false;
       }
     }
 
     // If the first URI is HTTPS, the second URI must also be HTTPS. This
     // defuses an attack where a third party with control over the network
     // tricks you into using HTTP to authenticate over a link which is supposed
     // to be HTTPS only and sniffs all your token cookies.
     if (strtolower($primary_uri->getProtocol()) == 'https') {
       if (strtolower($secondary_uri->getProtocol()) != 'https') {
         return false;
       }
     }
 
     return true;
   }
 
 }
diff --git a/src/applications/oauthserver/PhabricatorOAuthServerScope.php b/src/applications/oauthserver/PhabricatorOAuthServerScope.php
index 7950237dd2..be3b066a6e 100644
--- a/src/applications/oauthserver/PhabricatorOAuthServerScope.php
+++ b/src/applications/oauthserver/PhabricatorOAuthServerScope.php
@@ -1,106 +1,106 @@
 <?php
 
 final class PhabricatorOAuthServerScope {
 
   const SCOPE_OFFLINE_ACCESS = 'offline_access';
   const SCOPE_WHOAMI         = 'whoami';
   const SCOPE_NOT_ACCESSIBLE = 'not_accessible';
 
   /*
    * Note this does not contain SCOPE_NOT_ACCESSIBLE which is magic
    * used to simplify code for data that is not currently accessible
    * via OAuth.
    */
   static public function getScopesDict() {
     return array(
       self::SCOPE_OFFLINE_ACCESS => 1,
       self::SCOPE_WHOAMI         => 1,
     );
   }
 
   static public function getCheckboxControl($current_scopes) {
     $scopes = self::getScopesDict();
     $scope_keys = array_keys($scopes);
     sort($scope_keys);
 
     $checkboxes = new AphrontFormCheckboxControl();
     foreach ($scope_keys as $scope) {
       $checkboxes->addCheckbox(
         $name = $scope,
         $value = 1,
         $label = self::getCheckboxLabel($scope),
         $checked = isset($current_scopes[$scope]));
     }
     $checkboxes->setLabel('Scope');
 
     return $checkboxes;
   }
 
   static private function getCheckboxLabel($scope) {
     $label = null;
     switch ($scope) {
       case self::SCOPE_OFFLINE_ACCESS:
         $label = 'Make access tokens granted to this client never expire.';
         break;
       case self::SCOPE_WHOAMI:
         $label = 'Read access to Conduit method user.whoami.';
         break;
     }
 
     return $label;
   }
 
   static public function getScopesFromRequest(AphrontRequest $request) {
     $scopes = self::getScopesDict();
     $requested_scopes = array();
     foreach ($scopes as $scope => $bit) {
       if ($request->getBool($scope)) {
         $requested_scopes[$scope] = 1;
       }
     }
     return $requested_scopes;
   }
 
   /**
    * A scopes list is considered valid if each scope is a known scope
-   * and each scope is seen only once.  Otherwise, the list is invalid.
+   * and each scope is seen only once. Otherwise, the list is invalid.
    */
   static public function validateScopesList($scope_list) {
     $scopes       = explode(' ', $scope_list);
     $known_scopes = self::getScopesDict();
     $seen_scopes  = array();
     foreach ($scopes as $scope) {
       if (!isset($known_scopes[$scope])) {
         return false;
       }
       if (isset($seen_scopes[$scope])) {
         return false;
       }
       $seen_scopes[$scope] = 1;
     }
 
     return true;
   }
 
   /**
    * A scopes dictionary is considered valid if each key is a known scope.
    * Otherwise, the dictionary is invalid.
    */
   static public function validateScopesDict($scope_dict) {
     $known_scopes   = self::getScopesDict();
     $unknown_scopes = array_diff_key($scope_dict,
                                      $known_scopes);
     return empty($unknown_scopes);
   }
 
   /**
    * Transforms a space-delimited scopes list into a scopes dict. The list
    * should be validated by @{method:validateScopesList} before
    * transformation.
    */
    static public function scopesListToDict($scope_list) {
     $scopes = explode(' ', $scope_list);
     return array_fill_keys($scopes, 1);
   }
 
 }
diff --git a/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php b/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
index 79e5f79da0..11330447e6 100644
--- a/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
+++ b/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
@@ -1,269 +1,266 @@
 <?php
 
-/**
- * @group oauthserver
- */
 final class PhabricatorOAuthServerAuthController
-extends PhabricatorAuthController {
+  extends PhabricatorAuthController {
 
   public function shouldRequireLogin() {
     return true;
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $server        = new PhabricatorOAuthServer();
     $client_phid   = $request->getStr('client_id');
     $scope         = $request->getStr('scope', array());
     $redirect_uri  = $request->getStr('redirect_uri');
     $response_type = $request->getStr('response_type');
 
     // state is an opaque value the client sent us for their own purposes
     // we just need to send it right back to them in the response!
     $state = $request->getStr('state');
 
     if (!$client_phid) {
       return $this->buildErrorResponse(
         'invalid_request',
         pht('Malformed Request'),
         pht(
           'Required parameter %s was not present in the request.',
           phutil_tag('strong', array(), 'client_id')));
     }
 
     $server->setUser($viewer);
     $is_authorized = false;
     $authorization = null;
     $uri = null;
     $name = null;
 
     // one giant try / catch around all the exciting database stuff so we
     // can return a 'server_error' response if something goes wrong!
     try {
       $client = id(new PhabricatorOAuthServerClient())
         ->loadOneWhere('phid = %s', $client_phid);
 
       if (!$client) {
         return $this->buildErrorResponse(
           'invalid_request',
           pht('Invalid Client Application'),
           pht(
             'Request parameter %s does not specify a valid client application.',
             phutil_tag('strong', array(), 'client_id')));
       }
 
       $name = $client->getName();
       $server->setClient($client);
       if ($redirect_uri) {
         $client_uri   = new PhutilURI($client->getRedirectURI());
         $redirect_uri = new PhutilURI($redirect_uri);
         if (!($server->validateSecondaryRedirectURI($redirect_uri,
                                                     $client_uri))) {
           return $this->buildErrorResponse(
             'invalid_request',
             pht('Invalid Redirect URI'),
             pht(
               'Request parameter %s specifies an invalid redirect URI. '.
               'The redirect URI must be a fully-qualified domain with no '.
               'fragments, and must have the same domain and at least '.
               'the same query parameters as the redirect URI the client '.
               'registered.',
               phutil_tag('strong', array(), 'redirect_uri')));
         }
         $uri = $redirect_uri;
       } else {
         $uri = new PhutilURI($client->getRedirectURI());
       }
 
       if (empty($response_type)) {
         return $this->buildErrorResponse(
           'invalid_request',
           pht('Invalid Response Type'),
           pht(
             'Required request parameter %s is missing.',
             phutil_tag('strong', array(), 'response_type')));
       }
 
       if ($response_type != 'code') {
         return $this->buildErrorResponse(
           'unsupported_response_type',
           pht('Unsupported Response Type'),
           pht(
             'Request parameter %s specifies an unsupported response type. '.
             'Valid response types are: %s.',
             phutil_tag('strong', array(), 'response_type'),
             implode(', ', array('code'))));
       }
 
       if ($scope) {
         if (!PhabricatorOAuthServerScope::validateScopesList($scope)) {
           return $this->buildErrorResponse(
             'invalid_scope',
             pht('Invalid Scope'),
             pht(
               'Request parameter %s specifies an unsupported scope.',
               phutil_tag('strong', array(), 'scope')));
         }
         $scope = PhabricatorOAuthServerScope::scopesListToDict($scope);
       }
 
       // NOTE: We're always requiring a confirmation dialog to redirect.
       // Partly this is a general defense against redirect attacks, and
       // partly this shakes off anchors in the URI (which are not shaken
       // by 302'ing).
 
       $auth_info = $server->userHasAuthorizedClient($scope);
       list($is_authorized, $authorization) = $auth_info;
 
       if ($request->isFormPost()) {
         // TODO: We should probably validate this more? It feels a little funky.
         $scope = PhabricatorOAuthServerScope::getScopesFromRequest($request);
 
         if ($authorization) {
           $authorization->setScope($scope)->save();
         } else {
           $authorization = $server->authorizeClient($scope);
         }
 
         $is_authorized = true;
       }
     } catch (Exception $e) {
       return $this->buildErrorResponse(
         'server_error',
         pht('Server Error'),
         pht(
           'The authorization server encountered an unexpected condition '.
           'which prevented it from fulfilling the request.'));
     }
 
     // When we reach this part of the controller, we can be in two states:
     //
     //   1. The user has not authorized the application yet. We want to
     //      give them an "Authorize this application?" dialog.
     //   2. The user has authorized the application. We want to give them
     //      a "Confirm Login" dialog.
 
     if ($is_authorized) {
 
       // The second case is simpler, so handle it first. The user either
       // authorized the application previously, or has just authorized the
       // application. Show them a confirm dialog with a normal link back to
       // the application. This shakes anchors from the URI.
 
       $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
         $auth_code = $server->generateAuthorizationCode($uri);
       unset($unguarded);
 
       $full_uri = $this->addQueryParams(
         $uri,
         array(
           'code'  => $auth_code->getCode(),
           'scope' => $authorization->getScopeString(),
           'state' => $state,
         ));
 
       // TODO: It would be nice to give the user more options here, like
       // reviewing permissions, canceling the authorization, or aborting
       // the workflow.
 
       $dialog = id(new AphrontDialogView())
         ->setUser($viewer)
         ->setTitle(pht('Authenticate: %s', $name))
         ->appendParagraph(
           pht(
             'This application ("%s") is authorized to use your Phabricator '.
             'credentials. Continue to complete the authentication workflow.',
             phutil_tag('strong', array(), $name)))
         ->addCancelButton((string)$full_uri, pht('Continue to Application'));
 
       return id(new AphrontDialogResponse())->setDialog($dialog);
     }
 
     // Here, we're confirming authorization for the application.
 
     if ($scope) {
       if ($authorization) {
         $desired_scopes = array_merge($scope,
                                       $authorization->getScope());
       } else {
         $desired_scopes = $scope;
       }
       if (!PhabricatorOAuthServerScope::validateScopesDict($desired_scopes)) {
         return $this->buildErrorResponse(
           'invalid_scope',
           pht('Invalid Scope'),
           pht('The requested scope is invalid, unknown, or malformed.'));
       }
     } else {
       $desired_scopes = array(
         PhabricatorOAuthServerScope::SCOPE_WHOAMI         => 1,
         PhabricatorOAuthServerScope::SCOPE_OFFLINE_ACCESS => 1
       );
     }
 
     $form = id(new AphrontFormView())
       ->addHiddenInput('client_id', $client_phid)
       ->addHiddenInput('redirect_uri', $redirect_uri)
       ->addHiddenInput('response_type', $response_type)
       ->addHiddenInput('state', $state)
       ->addHiddenInput('scope', $request->getStr('scope'))
       ->setUser($viewer)
       ->appendChild(
         PhabricatorOAuthServerScope::getCheckboxControl($desired_scopes));
 
     $cancel_msg = pht('The user declined to authorize this application.');
     $cancel_uri = $this->addQueryParams(
       $uri,
       array(
         'error' => 'access_denied',
         'error_description' => $cancel_msg,
       ));
 
     $dialog = id(new AphrontDialogView())
       ->setUser($viewer)
       ->setTitle(pht('Authorize "%s"?', $name))
       ->setSubmitURI($request->getRequestURI()->getPath())
       ->setWidth(AphrontDialogView::WIDTH_FORM)
       ->appendParagraph(
         pht(
           'Do you want to authorize the external application "%s" to '.
           'access your Phabricator account data?',
           phutil_tag('strong', array(), $name)))
       ->appendChild($form->buildLayoutView())
       ->addSubmitButton(pht('Authorize Access'))
       ->addCancelButton((string)$cancel_uri, pht('Do Not Authorize'));
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
 
   private function buildErrorResponse($code, $title, $message) {
     $viewer = $this->getRequest()->getUser();
 
     $dialog = id(new AphrontDialogView())
       ->setUser($viewer)
       ->setTitle(pht('OAuth: %s', $title))
       ->appendParagraph($message)
       ->appendParagraph(
         pht('OAuth Error Code: %s', phutil_tag('tt', array(), $code)))
       ->addCancelButton('/', pht('Alas!'));
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
 
   private function addQueryParams(PhutilURI $uri, array $params) {
     $full_uri = clone $uri;
 
     foreach ($params as $key => $value) {
       if (strlen($value)) {
         $full_uri->setQueryParam($key, $value);
       }
     }
 
     return $full_uri;
   }
 
 }
diff --git a/src/applications/oauthserver/controller/PhabricatorOAuthServerTokenController.php b/src/applications/oauthserver/controller/PhabricatorOAuthServerTokenController.php
index 2b538f03e4..5b3db13fb9 100644
--- a/src/applications/oauthserver/controller/PhabricatorOAuthServerTokenController.php
+++ b/src/applications/oauthserver/controller/PhabricatorOAuthServerTokenController.php
@@ -1,140 +1,138 @@
 <?php
 
-/**
- * @group oauthserver
- */
 final class PhabricatorOAuthServerTokenController
-extends PhabricatorAuthController {
+  extends PhabricatorAuthController {
 
   public function shouldRequireLogin() {
     return false;
   }
 
   public function shouldAllowRestrictedParameter($parameter_name) {
     if ($parameter_name == 'code') {
       return true;
     }
     return parent::shouldAllowRestrictedParameter($parameter_name);
   }
 
   public function processRequest() {
     $request       = $this->getRequest();
     $grant_type    = $request->getStr('grant_type');
     $code          = $request->getStr('code');
     $redirect_uri  = $request->getStr('redirect_uri');
     $client_phid   = $request->getStr('client_id');
     $client_secret = $request->getStr('client_secret');
     $response      = new PhabricatorOAuthResponse();
     $server        = new PhabricatorOAuthServer();
     if ($grant_type != 'authorization_code') {
       $response->setError('unsupported_grant_type');
       $response->setErrorDescription(
         'Only grant_type authorization_code is supported.');
       return $response;
     }
     if (!$code) {
       $response->setError('invalid_request');
       $response->setErrorDescription(
         'Required parameter code missing.');
       return $response;
     }
     if (!$client_phid) {
       $response->setError('invalid_request');
       $response->setErrorDescription(
         'Required parameter client_id missing.');
       return $response;
     }
     if (!$client_secret) {
       $response->setError('invalid_request');
       $response->setErrorDescription(
         'Required parameter client_secret missing.');
       return $response;
     }
     // one giant try / catch around all the exciting database stuff so we
     // can return a 'server_error' response if something goes wrong!
     try {
       $auth_code = id(new PhabricatorOAuthServerAuthorizationCode())
         ->loadOneWhere('code = %s',
                        $code);
       if (!$auth_code) {
         $response->setError('invalid_grant');
         $response->setErrorDescription(
           'Authorization code '.$code.' not found.');
         return $response;
       }
 
       // if we have an auth code redirect URI, there must be a redirect_uri
       // in the request and it must match the auth code redirect uri *exactly*
       $auth_code_redirect_uri = $auth_code->getRedirectURI();
       if ($auth_code_redirect_uri) {
         $auth_code_redirect_uri = new PhutilURI($auth_code_redirect_uri);
         $redirect_uri           = new PhutilURI($redirect_uri);
         if (!$redirect_uri->getDomain() ||
              $redirect_uri != $auth_code_redirect_uri) {
           $response->setError('invalid_grant');
           $response->setErrorDescription(
             'Redirect uri in request must exactly match redirect uri '.
             'from authorization code.');
           return $response;
         }
       } else if ($redirect_uri) {
         $response->setError('invalid_grant');
         $response->setErrorDescription(
           'Redirect uri in request and no redirect uri in authorization '.
           'code. The two must exactly match.');
         return $response;
       }
 
       $client = id(new PhabricatorOAuthServerClient())
         ->loadOneWhere('phid = %s',
                        $client_phid);
       if (!$client) {
         $response->setError('invalid_client');
         $response->setErrorDescription(
           'Client with client_id '.$client_phid.' not found.');
         return $response;
       }
       $server->setClient($client);
 
       $user_phid = $auth_code->getUserPHID();
       $user = id(new PhabricatorUser())
         ->loadOneWhere('phid = %s', $user_phid);
       if (!$user) {
         $response->setError('invalid_grant');
         $response->setErrorDescription(
           'User with phid '.$user_phid.' not found.');
         return $response;
       }
       $server->setUser($user);
 
       $test_code = new PhabricatorOAuthServerAuthorizationCode();
       $test_code->setClientSecret($client_secret);
       $test_code->setClientPHID($client_phid);
       $is_good_code = $server->validateAuthorizationCode($auth_code,
                                                          $test_code);
       if (!$is_good_code) {
         $response->setError('invalid_grant');
         $response->setErrorDescription(
           'Invalid authorization code '.$code.'.');
         return $response;
       }
 
       $unguarded    = AphrontWriteGuard::beginScopedUnguardedWrites();
       $access_token = $server->generateAccessToken();
       $auth_code->delete();
       unset($unguarded);
       $result = array(
         'access_token' => $access_token->getToken(),
         'token_type'   => 'Bearer',
         'expires_in'   => PhabricatorOAuthServer::ACCESS_TOKEN_TIMEOUT,
       );
       return $response->setContent($result);
     } catch (Exception $e) {
       $response->setError('server_error');
       $response->setErrorDescription(
         'The authorization server encountered an unexpected condition '.
         'which prevented it from fulfilling the request.');
       return $response;
     }
   }
+
 }
diff --git a/src/applications/oauthserver/storage/PhabricatorOAuthServerAccessToken.php b/src/applications/oauthserver/storage/PhabricatorOAuthServerAccessToken.php
index c3ffc05d25..fd2e2d1080 100644
--- a/src/applications/oauthserver/storage/PhabricatorOAuthServerAccessToken.php
+++ b/src/applications/oauthserver/storage/PhabricatorOAuthServerAccessToken.php
@@ -1,12 +1,10 @@
 <?php
 
-/**
- * @group oauthserver
- */
 final class PhabricatorOAuthServerAccessToken
-extends PhabricatorOAuthServerDAO {
+  extends PhabricatorOAuthServerDAO {
+
   protected $id;
   protected $token;
   protected $userPHID;
   protected $clientPHID;
 }
diff --git a/src/applications/oauthserver/storage/PhabricatorOAuthServerAuthorizationCode.php b/src/applications/oauthserver/storage/PhabricatorOAuthServerAuthorizationCode.php
index 031674ba34..bbc39d2bc4 100644
--- a/src/applications/oauthserver/storage/PhabricatorOAuthServerAuthorizationCode.php
+++ b/src/applications/oauthserver/storage/PhabricatorOAuthServerAuthorizationCode.php
@@ -1,15 +1,12 @@
 <?php
 
-/**
- * @group oauthserver
- */
 final class PhabricatorOAuthServerAuthorizationCode
-extends PhabricatorOAuthServerDAO {
+  extends PhabricatorOAuthServerDAO {
 
   protected $id;
   protected $code;
   protected $clientPHID;
   protected $clientSecret;
   protected $userPHID;
   protected $redirectURI;
 }
diff --git a/src/applications/oauthserver/storage/PhabricatorOAuthServerDAO.php b/src/applications/oauthserver/storage/PhabricatorOAuthServerDAO.php
index 374c5965e7..ba3dbe1188 100644
--- a/src/applications/oauthserver/storage/PhabricatorOAuthServerDAO.php
+++ b/src/applications/oauthserver/storage/PhabricatorOAuthServerDAO.php
@@ -1,10 +1,9 @@
 <?php
 
-/**
- * @group oauthserver
- */
 abstract class PhabricatorOAuthServerDAO extends PhabricatorLiskDAO {
+
   public function getApplicationName() {
     return 'oauth_server';
   }
+
 }
diff --git a/src/applications/owners/conduit/ConduitAPI_owners_query_Method.php b/src/applications/owners/conduit/ConduitAPI_owners_query_Method.php
index 45805eeb6f..479a0aa516 100644
--- a/src/applications/owners/conduit/ConduitAPI_owners_query_Method.php
+++ b/src/applications/owners/conduit/ConduitAPI_owners_query_Method.php
@@ -1,158 +1,153 @@
 <?php
 
-/**
- * @group conduit
- */
-final class ConduitAPI_owners_query_Method
-  extends ConduitAPI_owners_Method {
+final class ConduitAPI_owners_query_Method extends ConduitAPI_owners_Method {
 
   public function getMethodDescription() {
     return 'Query for packages by one of the following: repository/path, '.
       'packages with a given user or project owner, or packages affiliated '.
       'with a user (owned by either the user or a project they are a member '.
       'of.) You should only provide at most one search query.';
   }
 
   public function defineParamTypes() {
     return array(
       'userOwner'                  => 'optional string',
       'projectOwner'               => 'optional string',
       'userAffiliated'             => 'optional string',
       'repositoryCallsign'         => 'optional string',
       'path'                       => 'optional string',
     );
-
   }
 
   public function defineReturnType() {
     return 'dict<phid -> dict of package info>';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-INVALID-USAGE' =>
         'Provide one of a single owner phid (user/project), a single '.
         'affiliated user phid (user), or a repository/path.',
       'ERR-INVALID-PARAMETER' => 'parameter should be a phid',
       'ERR_REP_NOT_FOUND'  => 'The repository callsign is not recognized',
     );
   }
 
   protected static function queryAll() {
     return id(new PhabricatorOwnersPackage())->loadAll();
   }
 
   protected static function queryByOwner($owner) {
     $is_valid_phid =
       phid_get_type($owner) == PhabricatorPeoplePHIDTypeUser::TYPECONST ||
       phid_get_type($owner) == PhabricatorProjectPHIDTypeProject::TYPECONST;
 
     if (!$is_valid_phid) {
       throw id(new ConduitException('ERR-INVALID-PARAMETER'))
         ->setErrorDescription(
           'Expected user/project PHID for owner, got '.$owner);
     }
 
     $owners = id(new PhabricatorOwnersOwner())->loadAllWhere(
       'userPHID = %s',
       $owner);
 
     $package_ids = mpull($owners, 'getPackageID');
     $packages = array();
     foreach ($package_ids as $id) {
       $packages[] = id(new PhabricatorOwnersPackage())->load($id);
     }
     return $packages;
   }
 
   private static function queryByPath(
     PhabricatorUser $viewer,
     $repo_callsign,
     $path) {
 
     $repository = id(new PhabricatorRepositoryQuery())
       ->setViewer($viewer)
       ->withCallsigns(array($repo_callsign))
       ->executeOne();
 
     if (!$repository) {
       throw id(new ConduitException('ERR_REP_NOT_FOUND'))
         ->setErrorDescription(
           'Repository callsign '.$repo_callsign.' not recognized');
     }
     if ($path == null) {
       return PhabricatorOwnersPackage::loadPackagesForRepository($repository);
     } else {
       return PhabricatorOwnersPackage::loadOwningPackages(
         $repository, $path);
     }
   }
 
   public static function buildPackageInformationDictionaries($packages) {
     assert_instances_of($packages, 'PhabricatorOwnersPackage');
 
     $result = array();
     foreach ($packages as $package) {
       $p_owners = $package->loadOwners();
       $p_paths = $package->loadPaths();
 
       $owners = array_values(mpull($p_owners, 'getUserPHID'));
       $paths = array();
       foreach ($p_paths as $p) {
         $paths[] = array($p->getRepositoryPHID(), $p->getPath());
       }
 
       $result[$package->getPHID()] = array(
         'phid' => $package->getPHID(),
         'name' => $package->getName(),
         'description' => $package->getDescription(),
         'primaryOwner' => $package->getPrimaryOwnerPHID(),
         'owners' => $owners,
         'paths' => $paths
       );
     }
     return $result;
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $is_owner_query =
       ($request->getValue('userOwner') ||
        $request->getValue('projectOwner')) ?
       1 : 0;
 
-    $is_affiliated_query = $request->getValue('userAffiliated') ?
-      1 : 0;
+    $is_affiliated_query = $request->getValue('userAffiliated') ? 1 : 0;
 
     $repo = $request->getValue('repositoryCallsign');
     $path = $request->getValue('path');
     $is_path_query = $repo ? 1 : 0;
 
     if ($is_owner_query + $is_path_query + $is_affiliated_query === 0) {
       // if no search terms are provided, return everything
       $packages = self::queryAll();
     } else if ($is_owner_query + $is_path_query + $is_affiliated_query > 1) {
       // otherwise, exactly one of these should be provided
       throw new ConduitException('ERR-INVALID-USAGE');
     }
 
     if ($is_affiliated_query) {
       $query = id(new PhabricatorOwnersPackageQuery())
         ->setViewer($request->getUser());
 
       $query->withOwnerPHIDs(array($request->getValue('userAffiliated')));
 
       $packages = $query->execute();
     } else if ($is_owner_query) {
       $owner = nonempty(
         $request->getValue('userOwner'),
         $request->getValue('projectOwner'));
 
       $packages = self::queryByOwner($owner);
 
     } else if ($is_path_query) {
       $packages = self::queryByPath($request->getUser(), $repo, $path);
     }
 
     return self::buildPackageInformationDictionaries($packages);
   }
+
 }
diff --git a/src/applications/paste/conduit/ConduitAPI_paste_Method.php b/src/applications/paste/conduit/ConduitAPI_paste_Method.php
index 4a5768b22f..0338cf6b7c 100644
--- a/src/applications/paste/conduit/ConduitAPI_paste_Method.php
+++ b/src/applications/paste/conduit/ConduitAPI_paste_Method.php
@@ -1,29 +1,26 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class ConduitAPI_paste_Method extends ConduitAPIMethod {
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
       'PhabricatorApplicationPaste');
   }
 
   protected function buildPasteInfoDictionary(PhabricatorPaste $paste) {
     return array(
       'id'          => $paste->getID(),
       'objectName'  => 'P'.$paste->getID(),
       'phid'        => $paste->getPHID(),
       'authorPHID'  => $paste->getAuthorPHID(),
       'filePHID'    => $paste->getFilePHID(),
       'title'       => $paste->getTitle(),
       'dateCreated' => $paste->getDateCreated(),
       'language'    => $paste->getLanguage(),
       'uri'         => PhabricatorEnv::getProductionURI('/P'.$paste->getID()),
       'parentPHID'  => $paste->getParentPHID(),
       'content'     => $paste->getRawContent(),
     );
   }
 
 }
diff --git a/src/applications/paste/conduit/ConduitAPI_paste_create_Method.php b/src/applications/paste/conduit/ConduitAPI_paste_create_Method.php
index f09f650db1..59b0382633 100644
--- a/src/applications/paste/conduit/ConduitAPI_paste_create_Method.php
+++ b/src/applications/paste/conduit/ConduitAPI_paste_create_Method.php
@@ -1,75 +1,72 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_paste_create_Method extends ConduitAPI_paste_Method {
 
   public function getMethodDescription() {
     return 'Create a new paste.';
   }
 
   public function defineParamTypes() {
     return array(
       'content'   => 'required string',
       'title'     => 'optional string',
       'language'  => 'optional string',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-NO-PASTE' => 'Paste may not be empty.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $content  = $request->getValue('content');
     $title    = $request->getValue('title');
     $language = $request->getValue('language');
 
     if (!strlen($content)) {
       throw new ConduitException('ERR-NO-PASTE');
     }
 
     $title = nonempty($title, 'Masterwork From Distant Lands');
     $language = nonempty($language, '');
 
     $viewer = $request->getUser();
 
     $paste = PhabricatorPaste::initializeNewPaste($viewer);
 
     $file = PhabricatorPasteEditor::initializeFileForPaste(
       $viewer,
       $title,
       $content);
 
     $xactions = array();
 
     $xactions[] = id(new PhabricatorPasteTransaction())
       ->setTransactionType(PhabricatorPasteTransaction::TYPE_CONTENT)
       ->setNewValue($file->getPHID());
 
     $xactions[] = id(new PhabricatorPasteTransaction())
       ->setTransactionType(PhabricatorPasteTransaction::TYPE_TITLE)
       ->setNewValue($title);
 
     $xactions[] = id(new PhabricatorPasteTransaction())
       ->setTransactionType(PhabricatorPasteTransaction::TYPE_LANGUAGE)
       ->setNewValue($language);
 
     $editor = id(new PhabricatorPasteEditor())
       ->setActor($viewer)
       ->setContentSourceFromConduitRequest($request);
 
     $xactions = $editor->applyTransactions($paste, $xactions);
 
     $paste->attachRawContent($content);
     return $this->buildPasteInfoDictionary($paste);
   }
 
 }
diff --git a/src/applications/paste/conduit/ConduitAPI_paste_info_Method.php b/src/applications/paste/conduit/ConduitAPI_paste_info_Method.php
index 7e3797019f..475bea4c4b 100644
--- a/src/applications/paste/conduit/ConduitAPI_paste_info_Method.php
+++ b/src/applications/paste/conduit/ConduitAPI_paste_info_Method.php
@@ -1,49 +1,46 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_paste_info_Method extends ConduitAPI_paste_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_DEPRECATED;
   }
 
   public function getMethodStatusDescription() {
     return "Replaced by 'paste.query'.";
   }
 
   public function getMethodDescription() {
     return 'Retrieve an array of information about a paste.';
   }
 
   public function defineParamTypes() {
     return array(
       'paste_id' => 'required id',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_BAD_PASTE' => 'No such paste exists',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $paste_id = $request->getValue('paste_id');
     $paste = id(new PhabricatorPasteQuery())
       ->setViewer($request->getUser())
       ->withIDs(array($paste_id))
       ->needRawContent(true)
       ->executeOne();
     if (!$paste) {
       throw new ConduitException('ERR_BAD_PASTE');
     }
     return $this->buildPasteInfoDictionary($paste);
   }
 
 }
diff --git a/src/applications/paste/conduit/ConduitAPI_paste_query_Method.php b/src/applications/paste/conduit/ConduitAPI_paste_query_Method.php
index c839d562dc..541e8b9b23 100644
--- a/src/applications/paste/conduit/ConduitAPI_paste_query_Method.php
+++ b/src/applications/paste/conduit/ConduitAPI_paste_query_Method.php
@@ -1,66 +1,63 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_paste_query_Method extends ConduitAPI_paste_Method {
 
   public function getMethodDescription() {
     return 'Query Pastes.';
   }
 
   public function defineParamTypes() {
     return array(
       'ids'           => 'optional list<int>',
       'phids'         => 'optional list<phid>',
       'authorPHIDs'   => 'optional list<phid>',
       'after'         => 'optional int',
       'limit'         => 'optional int, default = 100',
     );
   }
 
   public function defineReturnType() {
     return 'list<dict>';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $query = id(new PhabricatorPasteQuery())
       ->setViewer($request->getUser())
       ->needRawContent(true);
 
     if ($request->getValue('ids')) {
       $query->withIDs($request->getValue('ids'));
     }
 
     if ($request->getValue('phids')) {
       $query->withPHIDs($request->getValue('phids'));
     }
 
     if ($request->getValue('authorPHIDs')) {
       $query->withAuthorPHIDs($request->getValue('authorPHIDs'));
     }
 
     if ($request->getValue('after')) {
       $query->setAfterID($request->getValue('after'));
     }
 
     $limit = $request->getValue('limit', 100);
     if ($limit) {
       $query->setLimit($limit);
     }
 
     $pastes = $query->execute();
 
     $results = array();
     foreach ($pastes as $paste) {
       $results[$paste->getPHID()] = $this->buildPasteInfoDictionary($paste);
     }
 
     return $results;
   }
 
 }
diff --git a/src/applications/paste/config/PhabricatorPasteConfigOptions.php b/src/applications/paste/config/PhabricatorPasteConfigOptions.php
index a72aec20a1..cc001e12ed 100644
--- a/src/applications/paste/config/PhabricatorPasteConfigOptions.php
+++ b/src/applications/paste/config/PhabricatorPasteConfigOptions.php
@@ -1,32 +1,29 @@
 <?php
 
-/**
- * @group paste
- */
 final class PhabricatorPasteConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
     return pht('Paste');
   }
 
   public function getDescription() {
     return pht('Configure Paste.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption(
         'metamta.paste.public-create-email',
         'string',
         null)
         ->setDescription(pht('Allow creating pastes via email.')),
       $this->newOption(
         'metamta.paste.subject-prefix',
         'string',
         '[Paste]')
         ->setDescription(pht('Subject prefix for Paste email.'))
     );
   }
 
 }
diff --git a/src/applications/paste/controller/PhabricatorPasteCommentController.php b/src/applications/paste/controller/PhabricatorPasteCommentController.php
index f87795ce98..44727ecef5 100644
--- a/src/applications/paste/controller/PhabricatorPasteCommentController.php
+++ b/src/applications/paste/controller/PhabricatorPasteCommentController.php
@@ -1,73 +1,70 @@
 <?php
 
-/**
- * @group paste
- */
 final class PhabricatorPasteCommentController
   extends PhabricatorPasteController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = idx($data, 'id');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     if (!$request->isFormPost()) {
       return new Aphront400Response();
     }
 
     $paste = id(new PhabricatorPasteQuery())
       ->setViewer($user)
       ->withIDs(array($this->id))
       ->executeOne();
     if (!$paste) {
       return new Aphront404Response();
     }
 
     $is_preview = $request->isPreviewRequest();
     $draft = PhabricatorDraft::buildFromRequest($request);
 
     $view_uri = $paste->getURI();
 
     $xactions = array();
     $xactions[] = id(new PhabricatorPasteTransaction())
       ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
       ->attachComment(
         id(new PhabricatorPasteTransactionComment())
           ->setContent($request->getStr('comment')));
 
     $editor = id(new PhabricatorPasteEditor())
       ->setActor($user)
       ->setContinueOnNoEffect($request->isContinueRequest())
       ->setContentSourceFromRequest($request)
       ->setIsPreview($is_preview);
 
     try {
       $xactions = $editor->applyTransactions($paste, $xactions);
     } catch (PhabricatorApplicationTransactionNoEffectException $ex) {
       return id(new PhabricatorApplicationTransactionNoEffectResponse())
         ->setCancelURI($view_uri)
         ->setException($ex);
     }
 
     if ($draft) {
       $draft->replaceOrDelete();
     }
 
     if ($request->isAjax() && $is_preview) {
       return id(new PhabricatorApplicationTransactionResponse())
         ->setViewer($user)
         ->setTransactions($xactions)
         ->setIsPreview($is_preview)
         ->setAnchorOffset($request->getStr('anchor'));
     } else {
       return id(new AphrontRedirectResponse())
         ->setURI($view_uri);
     }
   }
 
 }
diff --git a/src/applications/paste/controller/PhabricatorPasteController.php b/src/applications/paste/controller/PhabricatorPasteController.php
index 133e3d0a45..dc5ff06845 100644
--- a/src/applications/paste/controller/PhabricatorPasteController.php
+++ b/src/applications/paste/controller/PhabricatorPasteController.php
@@ -1,57 +1,54 @@
 <?php
 
-/**
- * @group paste
- */
 abstract class PhabricatorPasteController extends PhabricatorController {
 
   public function buildSideNavView($for_app = false) {
     $user = $this->getRequest()->getUser();
 
     $nav = new AphrontSideNavFilterView();
     $nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
 
     if ($for_app) {
       $nav->addFilter('create', pht('Create Paste'));
     }
 
     id(new PhabricatorPasteSearchEngine())
       ->setViewer($user)
       ->addNavigationItems($nav->getMenu());
 
     $nav->selectFilter(null);
 
     return $nav;
   }
 
   public function buildApplicationMenu() {
     return $this->buildSideNavView(true)->getMenu();
   }
 
   public function buildApplicationCrumbs() {
     $crumbs = parent::buildApplicationCrumbs();
 
     $crumbs->addAction(
       id(new PHUIListItemView())
         ->setName(pht('Create Paste'))
         ->setHref($this->getApplicationURI('create/'))
         ->setIcon('fa-plus-square'));
 
     return $crumbs;
   }
 
   public function buildSourceCodeView(
     PhabricatorPaste $paste,
     $max_lines = null,
     $highlights = array()) {
 
     $lines = phutil_split_lines($paste->getContent());
 
     return id(new PhabricatorSourceCodeView())
       ->setLimit($max_lines)
       ->setLines($lines)
       ->setHighlights($highlights)
       ->setURI(new PhutilURI($paste->getURI()));
   }
 
 }
diff --git a/src/applications/paste/controller/PhabricatorPasteEditController.php b/src/applications/paste/controller/PhabricatorPasteEditController.php
index 0978a22c60..de4b20b70d 100644
--- a/src/applications/paste/controller/PhabricatorPasteEditController.php
+++ b/src/applications/paste/controller/PhabricatorPasteEditController.php
@@ -1,241 +1,237 @@
 <?php
 
-/**
- * @group paste
- */
 final class PhabricatorPasteEditController extends PhabricatorPasteController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = idx($data, 'id');
   }
 
-
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $parent = null;
     $parent_id = null;
     if (!$this->id) {
       $is_create = true;
 
       $paste = PhabricatorPaste::initializeNewPaste($user);
 
       $parent_id = $request->getStr('parent');
       if ($parent_id) {
         // NOTE: If the Paste is forked from a paste which the user no longer
         // has permission to see, we still let them edit it.
         $parent = id(new PhabricatorPasteQuery())
           ->setViewer($user)
           ->withIDs(array($parent_id))
           ->needContent(true)
           ->needRawContent(true)
           ->execute();
         $parent = head($parent);
 
         if ($parent) {
           $paste->setParentPHID($parent->getPHID());
           $paste->setViewPolicy($parent->getViewPolicy());
         }
       }
 
       $paste->setAuthorPHID($user->getPHID());
       $paste->attachRawContent('');
     } else {
       $is_create = false;
 
       $paste = id(new PhabricatorPasteQuery())
         ->setViewer($user)
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_VIEW,
             PhabricatorPolicyCapability::CAN_EDIT,
           ))
         ->withIDs(array($this->id))
         ->needRawContent(true)
         ->executeOne();
       if (!$paste) {
         return new Aphront404Response();
       }
     }
 
     $text = null;
     $e_text = true;
     $errors = array();
     if ($is_create && $parent) {
       $v_title = pht('Fork of %s', $parent->getFullName());
       $v_language = $parent->getLanguage();
       $v_text = $parent->getRawContent();
     } else {
       $v_title = $paste->getTitle();
       $v_language = $paste->getLanguage();
       $v_text = $paste->getRawContent();
     }
     $v_policy = $paste->getViewPolicy();
 
     if ($is_create) {
       $v_projects = array();
     } else {
       $v_projects = PhabricatorEdgeQuery::loadDestinationPHIDs(
         $paste->getPHID(),
         PhabricatorEdgeConfig::TYPE_OBJECT_HAS_PROJECT);
       $v_projects = array_reverse($v_projects);
     }
 
     if ($request->isFormPost()) {
       $xactions = array();
 
       $v_text = $request->getStr('text');
       if (!strlen($v_text)) {
         $e_text = pht('Required');
         $errors[] = pht('The paste may not be blank.');
       } else {
         $e_text = null;
       }
 
       $v_title = $request->getStr('title');
       $v_language = $request->getStr('language');
       $v_policy = $request->getStr('can_view');
       $v_projects = $request->getArr('projects');
 
       // NOTE: The author is the only editor and can always view the paste,
       // so it's impossible for them to choose an invalid policy.
 
       if (!$errors) {
         if ($is_create || ($v_text !== $paste->getRawContent())) {
           $file = PhabricatorPasteEditor::initializeFileForPaste(
             $user,
             $v_title,
             $v_text);
 
           $xactions[] = id(new PhabricatorPasteTransaction())
             ->setTransactionType(PhabricatorPasteTransaction::TYPE_CONTENT)
             ->setNewValue($file->getPHID());
         }
 
         $xactions[] = id(new PhabricatorPasteTransaction())
           ->setTransactionType(PhabricatorPasteTransaction::TYPE_TITLE)
           ->setNewValue($v_title);
         $xactions[] = id(new PhabricatorPasteTransaction())
           ->setTransactionType(PhabricatorPasteTransaction::TYPE_LANGUAGE)
           ->setNewValue($v_language);
         $xactions[] = id(new PhabricatorPasteTransaction())
           ->setTransactionType(PhabricatorTransactions::TYPE_VIEW_POLICY)
           ->setNewValue($v_policy);
 
         $proj_edge_type = PhabricatorEdgeConfig::TYPE_OBJECT_HAS_PROJECT;
         $xactions[] = id(new PhabricatorPasteTransaction())
           ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
           ->setMetadataValue('edge:type', $proj_edge_type)
           ->setNewValue(array('=' => array_fuse($v_projects)));
 
         $editor = id(new PhabricatorPasteEditor())
           ->setActor($user)
           ->setContentSourceFromRequest($request)
           ->setContinueOnNoEffect(true);
         $xactions = $editor->applyTransactions($paste, $xactions);
         return id(new AphrontRedirectResponse())->setURI($paste->getURI());
       } else {
         // make sure we update policy so its correctly populated to what
         // the user chose
         $paste->setViewPolicy($v_policy);
       }
     }
 
     $form = new AphrontFormView();
 
     $langs = array(
       '' => pht('(Detect From Filename in Title)'),
     ) + PhabricatorEnv::getEnvConfig('pygments.dropdown-choices');
 
     $form
       ->setUser($user)
       ->addHiddenInput('parent', $parent_id)
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Title'))
           ->setValue($v_title)
           ->setName('title'))
       ->appendChild(
         id(new AphrontFormSelectControl())
           ->setLabel(pht('Language'))
           ->setName('language')
           ->setValue($v_language)
           ->setOptions($langs));
 
     $policies = id(new PhabricatorPolicyQuery())
       ->setViewer($user)
       ->setObject($paste)
       ->execute();
 
     $form->appendChild(
       id(new AphrontFormPolicyControl())
         ->setUser($user)
         ->setCapability(PhabricatorPolicyCapability::CAN_VIEW)
         ->setPolicyObject($paste)
         ->setPolicies($policies)
         ->setName('can_view'));
 
 
     if ($v_projects) {
       $project_handles = $this->loadViewerHandles($v_projects);
     } else {
       $project_handles = array();
     }
 
     $form->appendChild(
       id(new AphrontFormTokenizerControl())
         ->setLabel(pht('Projects'))
         ->setName('projects')
         ->setValue($project_handles)
         ->setDatasource('/typeahead/common/projects/'));
 
     $form
       ->appendChild(
         id(new AphrontFormTextAreaControl())
           ->setLabel(pht('Text'))
           ->setError($e_text)
           ->setValue($v_text)
           ->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_TALL)
           ->setCustomClass('PhabricatorMonospaced')
           ->setName('text'));
 
     $submit = new AphrontFormSubmitControl();
 
     if (!$is_create) {
       $submit->addCancelButton($paste->getURI());
       $submit->setValue(pht('Save Paste'));
       $title = pht('Edit %s', $paste->getFullName());
       $short = pht('Edit');
     } else {
       $submit->setValue(pht('Create Paste'));
       $title = pht('Create New Paste');
       $short = pht('Create');
     }
 
     $form->appendChild($submit);
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText($title)
       ->setFormErrors($errors)
       ->setForm($form);
 
     $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView());
     if (!$is_create) {
       $crumbs->addTextCrumb('P'.$paste->getID(), '/P'.$paste->getID());
     }
     $crumbs->addTextCrumb($short);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $form_box,
       ),
       array(
         'title' => $title,
       ));
   }
 
 }
diff --git a/src/applications/paste/mail/PasteCreateMailReceiver.php b/src/applications/paste/mail/PasteCreateMailReceiver.php
index 5693a0e768..e75f9d9606 100644
--- a/src/applications/paste/mail/PasteCreateMailReceiver.php
+++ b/src/applications/paste/mail/PasteCreateMailReceiver.php
@@ -1,93 +1,88 @@
 <?php
 
-/**
- * @group paste
- */
-final class PasteCreateMailReceiver
-  extends PhabricatorMailReceiver {
+final class PasteCreateMailReceiver extends PhabricatorMailReceiver {
 
   public function isEnabled() {
     $app_class = 'PhabricatorApplicationPaste';
     return PhabricatorApplication::isClassInstalled($app_class);
   }
 
   public function canAcceptMail(PhabricatorMetaMTAReceivedMail $mail) {
     $config_key = 'metamta.paste.public-create-email';
     $create_address = PhabricatorEnv::getEnvConfig($config_key);
     if (!$create_address) {
       return false;
     }
 
     foreach ($mail->getToAddresses() as $to_address) {
       if ($this->matchAddresses($create_address, $to_address)) {
         return true;
       }
     }
 
     return false;
   }
 
   protected function processReceivedMail(
     PhabricatorMetaMTAReceivedMail $mail,
     PhabricatorUser $sender) {
 
     $title = $mail->getSubject();
     if (!$title) {
       $title = pht('Email Paste');
     }
 
     $file = PhabricatorPasteEditor::initializeFileForPaste(
       $sender,
       $title,
       $mail->getCleanTextBody());
 
     $xactions = array();
 
     $xactions[] = id(new PhabricatorPasteTransaction())
       ->setTransactionType(PhabricatorPasteTransaction::TYPE_CONTENT)
       ->setNewValue($file->getPHID());
 
     $xactions[] = id(new PhabricatorPasteTransaction())
       ->setTransactionType(PhabricatorPasteTransaction::TYPE_TITLE)
       ->setNewValue($title);
 
     $xactions[] = id(new PhabricatorPasteTransaction())
       ->setTransactionType(PhabricatorPasteTransaction::TYPE_LANGUAGE)
       ->setNewValue(''); // auto-detect
 
     $paste = PhabricatorPaste::initializeNewPaste($sender);
 
     $content_source = PhabricatorContentSource::newForSource(
       PhabricatorContentSource::SOURCE_EMAIL,
       array(
         'id' => $mail->getID(),
       ));
 
     $editor = id(new PhabricatorPasteEditor())
       ->setActor($sender)
       ->setContentSource($content_source)
       ->setContinueOnNoEffect(true);
     $xactions = $editor->applyTransactions($paste, $xactions);
 
     $mail->setRelatedPHID($paste->getPHID());
 
     $subject_prefix =
       PhabricatorEnv::getEnvConfig('metamta.paste.subject-prefix');
     $subject = pht('You successfully created a paste.');
     $paste_uri = PhabricatorEnv::getProductionURI($paste->getURI());
     $body = new PhabricatorMetaMTAMailBody();
     $body->addRawSection($subject);
     $body->addTextSection(pht('PASTE LINK'), $paste_uri);
 
     id(new PhabricatorMetaMTAMail())
       ->addTos(array($sender->getPHID()))
       ->setSubject($subject)
       ->setSubjectPrefix($subject_prefix)
       ->setFrom($sender->getPHID())
       ->setRelatedPHID($paste->getPHID())
       ->setBody($body->render())
       ->saveAndSend();
-
   }
 
 }
diff --git a/src/applications/paste/mail/PasteMockMailReceiver.php b/src/applications/paste/mail/PasteMockMailReceiver.php
index bab2160abe..94f352ce39 100644
--- a/src/applications/paste/mail/PasteMockMailReceiver.php
+++ b/src/applications/paste/mail/PasteMockMailReceiver.php
@@ -1,40 +1,37 @@
 <?php
 
-/**
- * @group paste
- */
 final class PasteMockMailReceiver extends PhabricatorObjectMailReceiver {
 
   public function isEnabled() {
     $app_class = 'PhabricatorApplicationPaste';
     return PhabricatorApplication::isClassInstalled($app_class);
   }
 
   protected function getObjectPattern() {
     return 'P[1-9]\d*';
   }
 
   protected function loadObject($pattern, PhabricatorUser $viewer) {
     $id = (int)trim($pattern, 'P');
 
     return id(new PhabricatorPasteQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->executeOne();
   }
 
   protected function processReceivedObjectMail(
     PhabricatorMetaMTAReceivedMail $mail,
     PhabricatorLiskDAO $object,
     PhabricatorUser $sender) {
 
     $handler = id(new PasteReplyHandler())
       ->setMailReceiver($object);
 
     $handler->setActor($sender);
     $handler->setExcludeMailRecipientPHIDs(
       $mail->loadExcludeMailRecipientPHIDs());
     $handler->processEmail($mail);
   }
 
 }
diff --git a/src/applications/paste/mail/PasteReplyHandler.php b/src/applications/paste/mail/PasteReplyHandler.php
index 4c585b1e5b..f94eceb09a 100644
--- a/src/applications/paste/mail/PasteReplyHandler.php
+++ b/src/applications/paste/mail/PasteReplyHandler.php
@@ -1,84 +1,80 @@
 <?php
 
-/**
- * @group paste
- */
 final class PasteReplyHandler extends PhabricatorMailReplyHandler {
 
   public function validateMailReceiver($mail_receiver) {
     if (!($mail_receiver instanceof PhabricatorPaste)) {
       throw new Exception('Mail receiver is not a PhabricatorPaste.');
     }
   }
 
   public function getPrivateReplyHandlerEmailAddress(
     PhabricatorObjectHandle $handle) {
     return $this->getDefaultPrivateReplyHandlerEmailAddress($handle, 'P');
   }
 
   public function getPublicReplyHandlerEmailAddress() {
     return $this->getDefaultPublicReplyHandlerEmailAddress('P');
   }
 
   public function getReplyHandlerInstructions() {
     if ($this->supportsReplies()) {
       return pht('Reply to comment or !unsubscribe.');
     } else {
       return null;
     }
   }
 
   protected function receiveEmail(PhabricatorMetaMTAReceivedMail $mail) {
     $actor = $this->getActor();
     $paste = $this->getMailReceiver();
 
     $body_data = $mail->parseBody();
     $body = $body_data['body'];
     $body = $this->enhanceBodyWithAttachments($body, $mail->getAttachments());
 
     $content_source = PhabricatorContentSource::newForSource(
       PhabricatorContentSource::SOURCE_EMAIL,
       array(
         'id' => $mail->getID(),
       ));
 
     $lines = explode("\n", trim($body));
     $first_line = head($lines);
 
     $xactions = array();
     $command = $body_data['command'];
 
     switch ($command) {
       case 'unsubscribe':
         $xaction = id(new PhabricatorPasteTransaction())
           ->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS)
           ->setNewValue(array('-' => array($actor->getPHID())));
         $xactions[] = $xaction;
         break;
     }
 
     $xactions[] = id(new PhabricatorPasteTransaction())
       ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
       ->attachComment(
        id(new PhabricatorPasteTransactionComment())
         ->setContent($body));
 
     $editor = id(new PhabricatorPasteEditor())
       ->setActor($actor)
       ->setContentSource($content_source)
       ->setContinueOnNoEffect(true)
       ->setIsPreview(false);
 
     try {
       $xactions = $editor->applyTransactions($paste, $xactions);
     } catch (PhabricatorApplicationTransactionNoEffectException $ex) {
       // just do nothing, though unclear why you're sending a blank email
       return true;
     }
 
     $head_xaction = head($xactions);
     return $head_xaction->getID();
-
   }
 
 }
diff --git a/src/applications/paste/query/PhabricatorPasteQuery.php b/src/applications/paste/query/PhabricatorPasteQuery.php
index a1b88d1102..934dc3d4ee 100644
--- a/src/applications/paste/query/PhabricatorPasteQuery.php
+++ b/src/applications/paste/query/PhabricatorPasteQuery.php
@@ -1,263 +1,258 @@
 <?php
 
-/**
- * @group paste
- */
 final class PhabricatorPasteQuery
   extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $ids;
   private $phids;
   private $authorPHIDs;
   private $parentPHIDs;
 
   private $needContent;
   private $needRawContent;
   private $languages;
   private $includeNoLanguage;
   private $dateCreatedAfter;
   private $dateCreatedBefore;
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
     return $this;
   }
 
   public function withPHIDs(array $phids) {
     $this->phids = $phids;
     return $this;
   }
 
   public function withAuthorPHIDs(array $phids) {
     $this->authorPHIDs = $phids;
     return $this;
   }
 
   public function withParentPHIDs(array $phids) {
     $this->parentPHIDs = $phids;
     return $this;
   }
 
   public function needContent($need_content) {
     $this->needContent = $need_content;
     return $this;
   }
 
   public function needRawContent($need_raw_content) {
     $this->needRawContent = $need_raw_content;
     return $this;
   }
 
   public function withLanguages(array $languages) {
     $this->includeNoLanguage = false;
     foreach ($languages as $key => $language) {
       if ($language === null) {
         $languages[$key] = '';
         continue;
       }
     }
     $this->languages = $languages;
     return $this;
   }
 
   public function withDateCreatedBefore($date_created_before) {
     $this->dateCreatedBefore = $date_created_before;
     return $this;
   }
 
   public function withDateCreatedAfter($date_created_after) {
     $this->dateCreatedAfter = $date_created_after;
     return $this;
   }
 
   protected function loadPage() {
     $table = new PhabricatorPaste();
     $conn_r = $table->establishConnection('r');
 
     $data = queryfx_all(
       $conn_r,
       'SELECT paste.* FROM %T paste %Q %Q %Q',
       $table->getTableName(),
       $this->buildWhereClause($conn_r),
       $this->buildOrderClause($conn_r),
       $this->buildLimitClause($conn_r));
 
     $pastes = $table->loadAllFromArray($data);
 
     return $pastes;
   }
 
   protected function didFilterPage(array $pastes) {
     if ($this->needRawContent) {
       $pastes = $this->loadRawContent($pastes);
     }
 
     if ($this->needContent) {
       $pastes = $this->loadContent($pastes);
     }
 
     return $pastes;
   }
 
   protected function buildWhereClause($conn_r) {
     $where = array();
 
     $where[] = $this->buildPagingClause($conn_r);
 
     if ($this->ids) {
       $where[] = qsprintf(
         $conn_r,
         'id IN (%Ld)',
         $this->ids);
     }
 
     if ($this->phids) {
       $where[] = qsprintf(
         $conn_r,
         'phid IN (%Ls)',
         $this->phids);
     }
 
     if ($this->authorPHIDs) {
       $where[] = qsprintf(
         $conn_r,
         'authorPHID IN (%Ls)',
         $this->authorPHIDs);
     }
 
     if ($this->parentPHIDs) {
       $where[] = qsprintf(
         $conn_r,
         'parentPHID IN (%Ls)',
         $this->parentPHIDs);
     }
 
     if ($this->languages) {
       $where[] = qsprintf(
         $conn_r,
         'language IN (%Ls)',
         $this->languages);
     }
 
     if ($this->dateCreatedAfter) {
       $where[] = qsprintf(
         $conn_r,
         'dateCreated >= %d',
         $this->dateCreatedAfter);
     }
 
     if ($this->dateCreatedBefore) {
       $where[] = qsprintf(
         $conn_r,
         'dateCreated <= %d',
         $this->dateCreatedBefore);
     }
 
     return $this->formatWhereClause($where);
   }
 
   private function getContentCacheKey(PhabricatorPaste $paste) {
     return implode(
       ':',
       array(
         'P'.$paste->getID(),
         $paste->getFilePHID(),
         $paste->getLanguage(),
       ));
   }
 
   private function loadRawContent(array $pastes) {
     $file_phids = mpull($pastes, 'getFilePHID');
     $files = id(new PhabricatorFileQuery())
       ->setParentQuery($this)
       ->setViewer($this->getViewer())
       ->withPHIDs($file_phids)
       ->execute();
     $files = mpull($files, null, 'getPHID');
 
     foreach ($pastes as $key => $paste) {
       $file = idx($files, $paste->getFilePHID());
       if (!$file) {
         unset($pastes[$key]);
         continue;
       }
       try {
         $paste->attachRawContent($file->loadFileData());
       } catch (Exception $ex) {
         // We can hit various sorts of file storage issues here. Just drop the
         // paste if the file is dead.
         unset($pastes[$key]);
         continue;
       }
     }
 
     return $pastes;
   }
 
   private function loadContent(array $pastes) {
     $cache = new PhabricatorKeyValueDatabaseCache();
 
     $cache = new PhutilKeyValueCacheProfiler($cache);
     $cache->setProfiler(PhutilServiceProfiler::getInstance());
 
     $keys = array();
     foreach ($pastes as $paste) {
       $keys[] = $this->getContentCacheKey($paste);
     }
 
     $caches = $cache->getKeys($keys);
     $results = array();
 
     $need_raw = array();
     foreach ($pastes as $key => $paste) {
       $key = $this->getContentCacheKey($paste);
       if (isset($caches[$key])) {
         $paste->attachContent(phutil_safe_html($caches[$key]));
         $results[$paste->getID()] = $paste;
       } else {
         $need_raw[$key] = $paste;
       }
     }
 
     if (!$need_raw) {
       return $results;
     }
 
     $write_data = array();
 
     $need_raw = $this->loadRawContent($need_raw);
     foreach ($need_raw as $key => $paste) {
       $content = $this->buildContent($paste);
       $paste->attachContent($content);
 
       $write_data[$this->getContentCacheKey($paste)] = (string)$content;
       $results[$paste->getID()] = $paste;
     }
 
     $cache->setKeys($write_data);
 
     return $results;
   }
 
-
   private function buildContent(PhabricatorPaste $paste) {
     $language = $paste->getLanguage();
     $source = $paste->getRawContent();
 
     if (empty($language)) {
       return PhabricatorSyntaxHighlighter::highlightWithFilename(
         $paste->getTitle(),
         $source);
     } else {
       return PhabricatorSyntaxHighlighter::highlightWithLanguage(
         $language,
         $source);
     }
   }
 
-
   public function getQueryApplicationClass() {
     return 'PhabricatorApplicationPaste';
   }
 
 }
diff --git a/src/applications/paste/query/PhabricatorPasteTransactionQuery.php b/src/applications/paste/query/PhabricatorPasteTransactionQuery.php
index 5ea3db4422..b0e9b5bc47 100644
--- a/src/applications/paste/query/PhabricatorPasteTransactionQuery.php
+++ b/src/applications/paste/query/PhabricatorPasteTransactionQuery.php
@@ -1,13 +1,10 @@
 <?php
 
-/**
- * @group paste
- */
 final class PhabricatorPasteTransactionQuery
   extends PhabricatorApplicationTransactionQuery {
 
   public function getTemplateApplicationTransaction() {
     return new PhabricatorPasteTransaction();
   }
 
 }
diff --git a/src/applications/paste/remarkup/PhabricatorPasteRemarkupRule.php b/src/applications/paste/remarkup/PhabricatorPasteRemarkupRule.php
index 8185c39fb8..db3c4f1ed1 100644
--- a/src/applications/paste/remarkup/PhabricatorPasteRemarkupRule.php
+++ b/src/applications/paste/remarkup/PhabricatorPasteRemarkupRule.php
@@ -1,59 +1,56 @@
 <?php
 
-/**
- * @group markup
- */
-final class PhabricatorPasteRemarkupRule
-  extends PhabricatorRemarkupRuleObject {
+final class PhabricatorPasteRemarkupRule extends PhabricatorRemarkupRuleObject {
 
   protected function getObjectNamePrefix() {
     return 'P';
   }
 
   protected function loadObjects(array $ids) {
     $viewer = $this->getEngine()->getConfig('viewer');
 
     return id(new PhabricatorPasteQuery())
       ->setViewer($viewer)
       ->withIDs($ids)
       ->needContent(true)
       ->execute();
 
   }
 
   protected function renderObjectEmbed($object, $handle, $options) {
     $embed_paste = id(new PasteEmbedView())
       ->setPaste($object)
       ->setHandle($handle);
 
     if (strlen($options)) {
       $parser = new PhutilSimpleOptions();
       $opts = $parser->parse(substr($options, 1));
 
       foreach ($opts as $key => $value) {
         if ($key == 'lines') {
           $embed_paste->setLines(preg_replace('/[^0-9]/', '', $value));
         } else if ($key == 'highlight') {
           $highlights = preg_split('/,|&/', preg_replace('/\s+/', '', $value));
 
           $to_highlight = array();
           foreach ($highlights as $highlight) {
             $highlight = explode('-', $highlight);
 
             if (!empty($highlight)) {
               sort($highlight);
               $to_highlight = array_merge(
                 $to_highlight,
                 range(head($highlight), last($highlight)));
             }
           }
 
           $embed_paste->setHighlights(array_unique($to_highlight));
         }
       }
 
     }
 
     return $embed_paste;
   }
+
 }
diff --git a/src/applications/paste/storage/PhabricatorPasteTransactionComment.php b/src/applications/paste/storage/PhabricatorPasteTransactionComment.php
index 86655e060e..145a375793 100644
--- a/src/applications/paste/storage/PhabricatorPasteTransactionComment.php
+++ b/src/applications/paste/storage/PhabricatorPasteTransactionComment.php
@@ -1,20 +1,18 @@
 <?php
 
-/**
- * @group paste
- */
 final class PhabricatorPasteTransactionComment
   extends PhabricatorApplicationTransactionComment {
 
   protected $lineNumber;
   protected $lineLength;
 
   public function getApplicationTransactionObject() {
     return new PhabricatorPasteTransaction();
   }
 
   public function shouldUseMarkupCache($field) {
     // Only cache submitted comments.
     return ($this->getTransactionPHID() != null);
   }
+
 }
diff --git a/src/applications/people/conduit/ConduitAPI_user_disable_Method.php b/src/applications/people/conduit/ConduitAPI_user_disable_Method.php
index cca8ae00c6..bf7a274baf 100644
--- a/src/applications/people/conduit/ConduitAPI_user_disable_Method.php
+++ b/src/applications/people/conduit/ConduitAPI_user_disable_Method.php
@@ -1,53 +1,49 @@
 <?php
 
-/**
- * @group conduit
- */
-final class ConduitAPI_user_disable_Method
-  extends ConduitAPI_user_Method {
+final class ConduitAPI_user_disable_Method extends ConduitAPI_user_Method {
 
   public function getMethodDescription() {
     return 'Permanently disable specified users (admin only).';
   }
 
   public function defineParamTypes() {
     return array(
       'phids' => 'required list<phid>',
     );
   }
 
   public function defineReturnType() {
     return 'void';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-PERMISSIONS' => 'Only admins can call this method.',
       'ERR-BAD-PHID' => 'Non existent user PHID.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $actor = $request->getUser();
     if (!$actor->getIsAdmin()) {
       throw new ConduitException('ERR-PERMISSIONS');
     }
 
     $phids = $request->getValue('phids');
 
     $users = id(new PhabricatorUser())->loadAllWhere(
       'phid IN (%Ls)',
       $phids);
 
     if (count($phids) != count($users)) {
       throw new ConduitException('ERR-BAD-PHID');
     }
 
     foreach ($users as $user) {
       id(new PhabricatorUserEditor())
         ->setActor($actor)
         ->disableUser($user, true);
     }
   }
 
 }
diff --git a/src/applications/people/conduit/ConduitAPI_user_enable_Method.php b/src/applications/people/conduit/ConduitAPI_user_enable_Method.php
index ad0b8b8144..44f79f468b 100644
--- a/src/applications/people/conduit/ConduitAPI_user_enable_Method.php
+++ b/src/applications/people/conduit/ConduitAPI_user_enable_Method.php
@@ -1,53 +1,49 @@
 <?php
 
-/**
- * @group conduit
- */
-final class ConduitAPI_user_enable_Method
-  extends ConduitAPI_user_Method {
+final class ConduitAPI_user_enable_Method extends ConduitAPI_user_Method {
 
   public function getMethodDescription() {
     return 'Re-enable specified users (admin only).';
   }
 
   public function defineParamTypes() {
     return array(
       'phids' => 'required list<phid>',
     );
   }
 
   public function defineReturnType() {
     return 'void';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-PERMISSIONS' => 'Only admins can call this method.',
       'ERR-BAD-PHID' => 'Non existent user PHID.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $actor = $request->getUser();
     if (!$actor->getIsAdmin()) {
       throw new ConduitException('ERR-PERMISSIONS');
     }
 
     $phids = $request->getValue('phids');
 
     $users = id(new PhabricatorUser())->loadAllWhere(
       'phid IN (%Ls)',
       $phids);
 
     if (count($phids) != count($users)) {
       throw new ConduitException('ERR-BAD-PHID');
     }
 
     foreach ($users as $user) {
       id(new PhabricatorUserEditor())
         ->setActor($actor)
         ->disableUser($user, false);
     }
   }
 
 }
diff --git a/src/applications/people/conduit/ConduitAPI_user_info_Method.php b/src/applications/people/conduit/ConduitAPI_user_info_Method.php
index a514ab7478..f7279b9519 100644
--- a/src/applications/people/conduit/ConduitAPI_user_info_Method.php
+++ b/src/applications/people/conduit/ConduitAPI_user_info_Method.php
@@ -1,50 +1,45 @@
 <?php
 
-/**
- * @group conduit
- */
-final class ConduitAPI_user_info_Method
-  extends ConduitAPI_user_Method {
+final class ConduitAPI_user_info_Method extends ConduitAPI_user_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_DEPRECATED;
   }
 
   public function getMethodStatusDescription() {
     return "Replaced by 'user.query'.";
   }
 
   public function getMethodDescription() {
     return 'Retrieve information about a user by PHID.';
   }
 
   public function defineParamTypes() {
     return array(
       'phid' => 'required phid',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict<string, wild>';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-BAD-USER' => 'No such user exists.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
-
     $user = id(new PhabricatorUser())->loadOneWhere(
       'phid = %s',
       $request->getValue('phid'));
 
     if (!$user) {
       throw new ConduitException('ERR-BAD-USER');
     }
 
     return $this->buildUserInformationDictionary($user);
   }
 
 }
diff --git a/src/applications/people/conduit/ConduitAPI_user_query_Method.php b/src/applications/people/conduit/ConduitAPI_user_query_Method.php
index 1464dd0f82..51c7e90f22 100644
--- a/src/applications/people/conduit/ConduitAPI_user_query_Method.php
+++ b/src/applications/people/conduit/ConduitAPI_user_query_Method.php
@@ -1,83 +1,79 @@
 <?php
 
-/**
- * @group conduit
- */
-final class ConduitAPI_user_query_Method
-  extends ConduitAPI_user_Method {
+final class ConduitAPI_user_query_Method extends ConduitAPI_user_Method {
 
   public function getMethodDescription() {
     return 'Query users.';
   }
 
   public function defineParamTypes() {
-
     return array(
       'usernames'    => 'optional list<string>',
       'emails'       => 'optional list<string>',
       'realnames'    => 'optional list<string>',
       'phids'        => 'optional list<phid>',
       'ids'          => 'optional list<uint>',
       'offset'       => 'optional int',
       'limit'        => 'optional int (default = 100)',
     );
 
   }
 
   public function defineReturnType() {
     return 'list<dict>';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-INVALID-PARAMETER' => 'Missing or malformed parameter.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $usernames   = $request->getValue('usernames', array());
     $emails      = $request->getValue('emails',    array());
     $realnames   = $request->getValue('realnames', array());
     $phids       = $request->getValue('phids',     array());
     $ids         = $request->getValue('ids',       array());
     $offset      = $request->getValue('offset',    0);
     $limit       = $request->getValue('limit',     100);
 
     $query = new PhabricatorPeopleQuery();
     $query->setViewer($request->getUser());
 
     if ($usernames) {
       $query->withUsernames($usernames);
     }
     if ($emails) {
       $query->withEmails($emails);
     }
     if ($realnames) {
       $query->withRealnames($realnames);
     }
     if ($phids) {
       $query->withPHIDs($phids);
     }
     if ($ids) {
       $query->withIDs($ids);
     }
     if ($limit) {
       $query->setLimit($limit);
     }
     if ($offset) {
       $query->setOffset($offset);
     }
     $users = $query->execute();
 
     $statuses = id(new PhabricatorCalendarEvent())->loadCurrentStatuses(
       mpull($users, 'getPHID'));
 
     $results = array();
     foreach ($users as $user) {
       $results[] = $this->buildUserInformationDictionary(
         $user,
         idx($statuses, $user->getPHID()));
     }
     return $results;
   }
+
 }
diff --git a/src/applications/people/conduit/ConduitAPI_user_whoami_Method.php b/src/applications/people/conduit/ConduitAPI_user_whoami_Method.php
index aaf0429705..17d7407e43 100644
--- a/src/applications/people/conduit/ConduitAPI_user_whoami_Method.php
+++ b/src/applications/people/conduit/ConduitAPI_user_whoami_Method.php
@@ -1,35 +1,29 @@
 <?php
 
-/**
- * @group conduit
- */
-final class ConduitAPI_user_whoami_Method
-  extends ConduitAPI_user_Method {
+final class ConduitAPI_user_whoami_Method extends ConduitAPI_user_Method {
 
   public function getMethodDescription() {
     return 'Retrieve information about the logged-in user.';
   }
 
   public function defineParamTypes() {
-    return array(
-    );
+    return array();
   }
 
   public function defineReturnType() {
     return 'nonempty dict<string, wild>';
   }
 
   public function defineErrorTypes() {
-    return array(
-    );
+    return array();
   }
 
   public function getRequiredScope() {
     return PhabricatorOAuthServerScope::SCOPE_WHOAMI;
   }
 
   protected function execute(ConduitAPIRequest $request) {
     return $this->buildUserInformationDictionary($request->getUser());
   }
 
 }
diff --git a/src/applications/people/remarkup/PhabricatorRemarkupRuleMention.php b/src/applications/people/remarkup/PhabricatorRemarkupRuleMention.php
index 7e6fb237ef..c39959bcb1 100644
--- a/src/applications/people/remarkup/PhabricatorRemarkupRuleMention.php
+++ b/src/applications/people/remarkup/PhabricatorRemarkupRuleMention.php
@@ -1,150 +1,146 @@
 <?php
 
-/**
- * @group markup
- */
-final class PhabricatorRemarkupRuleMention
-  extends PhutilRemarkupRule {
+final class PhabricatorRemarkupRuleMention extends PhutilRemarkupRule {
 
   const KEY_RULE_MENTION          = 'rule.mention';
   const KEY_RULE_MENTION_ORIGINAL = 'rule.mention.original';
 
   const KEY_MENTIONED = 'phabricator.mentioned-user-phids';
 
 
   // NOTE: The negative lookbehind prevents matches like "mail@lists", while
   // allowing constructs like "@tomo/@mroch". Since we now allow periods in
   // usernames, we can't resonably distinguish that "@company.com" isn't a
   // username, so we'll incorrectly pick it up, but there's little to be done
   // about that. We forbid terminal periods so that we can correctly capture
   // "@joe" instead of "@joe." in "Hey, @joe.".
   //
   // We disallow "@@joe" because it creates a false positive in the common
   // construction "l@@k", made popular by eBay.
   const REGEX = '/(?<!\w|@)@([a-zA-Z0-9._-]*[a-zA-Z0-9_-])/';
 
   public function apply($text) {
     return preg_replace_callback(
       self::REGEX,
       array($this, 'markupMention'),
       $text);
   }
 
   protected function markupMention($matches) {
     $engine = $this->getEngine();
 
     if ($engine->isTextMode()) {
       return $engine->storeText($matches[0]);
     }
 
     $token = $engine->storeText('');
 
     // Store the original text exactly so we can preserve casing if it doesn't
     // resolve into a username.
     $original_key = self::KEY_RULE_MENTION_ORIGINAL;
     $original = $engine->getTextMetadata($original_key, array());
     $original[$token] = $matches[1];
     $engine->setTextMetadata($original_key, $original);
 
     $metadata_key = self::KEY_RULE_MENTION;
     $metadata = $engine->getTextMetadata($metadata_key, array());
     $username = strtolower($matches[1]);
     if (empty($metadata[$username])) {
       $metadata[$username] = array();
     }
     $metadata[$username][] = $token;
     $engine->setTextMetadata($metadata_key, $metadata);
 
     return $token;
   }
 
   public function didMarkupText() {
     $engine = $this->getEngine();
 
     $metadata_key = self::KEY_RULE_MENTION;
     $metadata = $engine->getTextMetadata($metadata_key, array());
     if (empty($metadata)) {
       // No mentions, or we already processed them.
       return;
     }
 
     $original_key = self::KEY_RULE_MENTION_ORIGINAL;
     $original = $engine->getTextMetadata($original_key, array());
 
     $usernames = array_keys($metadata);
 
     $users = id(new PhabricatorPeopleQuery())
       ->setViewer($this->getEngine()->getConfig('viewer'))
       ->withUsernames($usernames)
       ->execute();
 
     if ($users) {
       $user_statuses = id(new PhabricatorCalendarEvent())
         ->loadCurrentStatuses(mpull($users, 'getPHID'));
       $user_statuses = mpull($user_statuses, null, 'getUserPHID');
     } else {
       $user_statuses = array();
     }
 
     $actual_users = array();
 
     $mentioned_key = self::KEY_MENTIONED;
     $mentioned = $engine->getTextMetadata($mentioned_key, array());
     foreach ($users as $row) {
       $actual_users[strtolower($row->getUserName())] = $row;
       $mentioned[$row->getPHID()] = $row->getPHID();
     }
 
     $engine->setTextMetadata($mentioned_key, $mentioned);
 
     foreach ($metadata as $username => $tokens) {
       $exists = isset($actual_users[$username]);
 
       if ($exists) {
         $user = $actual_users[$username];
         Javelin::initBehavior('phabricator-hovercards');
 
         $tag = id(new PHUITagView())
           ->setType(PHUITagView::TYPE_PERSON)
           ->setPHID($user->getPHID())
           ->setName('@'.$user->getUserName())
           ->setHref('/p/'.$user->getUserName().'/');
 
         if (!$user->isUserActivated()) {
           $tag->setDotColor(PHUITagView::COLOR_GREY);
         } else {
           $status = idx($user_statuses, $user->getPHID());
           if ($status) {
             $status = $status->getStatus();
             if ($status == PhabricatorCalendarEvent::STATUS_AWAY) {
               $tag->setDotColor(PHUITagView::COLOR_RED);
             } else if ($status == PhabricatorCalendarEvent::STATUS_AWAY) {
               $tag->setDotColor(PHUITagView::COLOR_ORANGE);
             }
           }
         }
 
         foreach ($tokens as $token) {
           $engine->overwriteStoredText($token, $tag);
         }
       } else {
         // NOTE: The structure here is different from the 'exists' branch,
         // because we want to preserve the original text capitalization and it
         // may differ for each token.
         foreach ($tokens as $token) {
           $tag = phutil_tag(
             'span',
             array(
               'class' => 'phabricator-remarkup-mention-unknown',
             ),
             '@'.idx($original, $token, $username));
           $engine->overwriteStoredText($token, $tag);
         }
       }
     }
 
     // Don't re-process these mentions.
     $engine->setTextMetadata($metadata_key, array());
   }
 
 }
diff --git a/src/applications/phame/conduit/ConduitAPI_phame_Method.php b/src/applications/phame/conduit/ConduitAPI_phame_Method.php
index 4ac2f4cb5f..47159513ae 100644
--- a/src/applications/phame/conduit/ConduitAPI_phame_Method.php
+++ b/src/applications/phame/conduit/ConduitAPI_phame_Method.php
@@ -1,12 +1,9 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class ConduitAPI_phame_Method extends ConduitAPIMethod {
 
   public function getApplication() {
     return PhabricatorApplication::getByClass('PhabricatorApplicationPhame');
   }
 
 }
diff --git a/src/applications/phame/conduit/ConduitAPI_phame_query_Method.php b/src/applications/phame/conduit/ConduitAPI_phame_query_Method.php
index 2cf9d18bac..334e0425e6 100644
--- a/src/applications/phame/conduit/ConduitAPI_phame_query_Method.php
+++ b/src/applications/phame/conduit/ConduitAPI_phame_query_Method.php
@@ -1,84 +1,78 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_phame_query_Method extends ConduitAPI_phame_Method {
 
   public function getMethodDescription() {
     return 'Query phame blogs.';
   }
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function defineParamTypes() {
     return array(
       'ids'           => 'optional list<int>',
       'phids'         => 'optional list<phid>',
       'after'         => 'optional int',
       'before'        => 'optional int',
       'limit'         => 'optional int',
     );
   }
 
   public function defineReturnType() {
     return 'list<dict>';
   }
 
   public function defineErrorTypes() {
-    return array(
-    );
+    return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
-
     $query = new PhameBlogQuery();
 
     $query->setViewer($request->getUser());
 
     $ids = $request->getValue('ids', array());
     if ($ids) {
       $query->withIDs($ids);
     }
 
     $phids = $request->getValue('phids', array());
     if ($phids) {
       $query->withPHIDs($phids);
     }
 
     $after = $request->getValue('after', null);
     if ($after !== null) {
       $query->setAfterID($after);
     }
 
     $before = $request->getValue('before', null);
     if ($before !== null) {
       $query->setBeforeID($before);
     }
 
     $limit = $request->getValue('limit', null);
     if ($limit !== null) {
       $query->setLimit($limit);
     }
 
     $blogs = $query->execute();
 
     $results = array();
     foreach ($blogs as $blog) {
       $results[] = array(
         'id'              => $blog->getID(),
         'phid'            => $blog->getPHID(),
         'name'            => $blog->getName(),
         'description'     => $blog->getDescription(),
         'domain'          => $blog->getDomain(),
         'creatorPHID'     => $blog->getCreatorPHID(),
       );
     }
 
     return $results;
   }
 
-
 }
diff --git a/src/applications/phame/conduit/ConduitAPI_phame_queryposts_Method.php b/src/applications/phame/conduit/ConduitAPI_phame_queryposts_Method.php
index 3df67eb188..ea3c88c2fd 100644
--- a/src/applications/phame/conduit/ConduitAPI_phame_queryposts_Method.php
+++ b/src/applications/phame/conduit/ConduitAPI_phame_queryposts_Method.php
@@ -1,109 +1,104 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_phame_queryposts_Method extends ConduitAPI_phame_Method {
 
   public function getMethodDescription() {
     return 'Query phame posts.';
   }
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function defineParamTypes() {
     return array(
       'ids'            => 'optional list<int>',
       'phids'          => 'optional list<phid>',
       'blogPHIDs'      => 'optional list<phid>',
       'bloggerPHIDs'   => 'optional list<phid>',
       'phameTitles'    => 'optional list<string>',
       'published'      => 'optional bool',
       'publishedAfter' => 'optional date',
       'before'         => 'optional int',
       'after'          => 'optional int',
       'limit'          => 'optional int',
     );
   }
 
   public function defineReturnType() {
     return 'list<dict>';
   }
 
   public function defineErrorTypes() {
     return array(
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
-
     $query = new PhamePostQuery();
 
     $query->setViewer($request->getUser());
 
     $ids = $request->getValue('ids', array());
     if ($ids) {
       $query->withIDs($ids);
     }
 
     $phids = $request->getValue('phids', array());
     if ($phids) {
       $query->withPHIDs($phids);
     }
 
     $blog_phids = $request->getValue('blogPHIDs', array());
     if ($blog_phids) {
       $query->withBlogPHIDs($blog_phids);
     }
 
     $blogger_phids = $request->getValue('bloggerPHIDs', array());
     if ($blogger_phids) {
       $query->withBloggerPHIDs($blogger_phids);
     }
 
     $phame_titles = $request->getValue('phameTitles', array());
     if ($phame_titles) {
       $query->withPhameTitles($phame_titles);
     }
 
     $published = $request->getValue('published', null);
     if ($published === true) {
       $query->withVisibility(PhamePost::VISIBILITY_PUBLISHED);
     } else if ($published === false) {
       $query->withVisibility(PhamePost::VISIBILITY_DRAFT);
     }
 
     $published_after = $request->getValue('publishedAfter', null);
     if ($published_after !== null) {
       $query->withPublishedAfter($published_after);
     }
 
     $after = $request->getValue('after', null);
     if ($after !== null) {
       $query->setAfterID($after);
     }
 
     $before = $request->getValue('before', null);
     if ($before !== null) {
       $query->setBeforeID($before);
     }
 
     $limit = $request->getValue('limit', null);
     if ($limit !== null) {
       $query->setLimit($limit);
     }
 
     $posts = $query->execute();
 
     $results = array();
     foreach ($posts as $post) {
       $results[] = $post->toDictionary();
     }
 
     return $results;
   }
 
-
 }
diff --git a/src/applications/phame/controller/PhameResourceController.php b/src/applications/phame/controller/PhameResourceController.php
index f63c3d765c..ad41ecda74 100644
--- a/src/applications/phame/controller/PhameResourceController.php
+++ b/src/applications/phame/controller/PhameResourceController.php
@@ -1,75 +1,72 @@
 <?php
 
-/**
- * @group phame
- */
 final class PhameResourceController extends CelerityResourceController {
 
   private $id;
   private $hash;
   private $name;
   private $root;
   private $celerityResourceMap;
 
   public function getCelerityResourceMap() {
     return $this->celerityResourceMap;
   }
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
     $this->hash = $data['hash'];
     $this->name = $data['name'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     // We require a visible blog associated with a given skin to serve
     // resources, so you can't go fishing around where you shouldn't be.
     // However, since these resources may be served off a CDN domain, we're
     // bypassing the actual policy check. The blog needs to exist, but you
     // don't necessarily need to be able to see it in order to see static
     // resources on it.
 
     $blog = id(new PhameBlogQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withIDs(array($this->id))
       ->executeOne();
     if (!$blog) {
       return new Aphront404Response();
     }
 
     $skin = $blog->getSkinRenderer($request);
     $spec = $skin->getSpecification();
 
     $resources = new PhameCelerityResources();
     $resources->setSkin($spec);
 
     $this->root = $spec->getRootDirectory();
     $this->celerityResourceMap = new CelerityResourceMap($resources);
 
     return $this->serveResource($this->name);
   }
 
   protected function buildResourceTransformer() {
     $xformer = new CelerityResourceTransformer();
     $xformer->setMinify(false);
     $xformer->setTranslateURICallback(array($this, 'translateResourceURI'));
     return $xformer;
   }
 
   public function translateResourceURI(array $matches) {
     $uri = trim($matches[1], "'\" \r\t\n");
 
     if (Filesystem::pathExists($this->root.$uri)) {
       $hash = filemtime($this->root.$uri);
     } else {
       $hash = '-';
     }
 
     $uri = '/phame/r/'.$this->id.'/'.$hash.'/'.$uri;
     return 'url('.$uri.')';
   }
 
 }
diff --git a/src/applications/phame/controller/blog/PhameBlogDeleteController.php b/src/applications/phame/controller/blog/PhameBlogDeleteController.php
index e6d9b4dff6..82770b2877 100644
--- a/src/applications/phame/controller/blog/PhameBlogDeleteController.php
+++ b/src/applications/phame/controller/blog/PhameBlogDeleteController.php
@@ -1,50 +1,48 @@
 <?php
 
-/**
- * @group phame
- */
 final class PhameBlogDeleteController extends PhameController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $blog = id(new PhameBlogQuery())
       ->setViewer($user)
       ->withIDs(array($this->id))
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->executeOne();
     if (!$blog) {
       return new Aphront404Response();
     }
 
     if ($request->isFormPost()) {
       $blog->delete();
       return id(new AphrontRedirectResponse())
         ->setURI($this->getApplicationURI());
     }
 
     $cancel_uri = $this->getApplicationURI('/blog/view/'.$blog->getID().'/');
 
     $dialog = id(new AphrontDialogView())
       ->setUser($user)
       ->setTitle(pht('Delete Blog?'))
       ->appendChild(
         pht(
           'Really delete the blog "%s"? It will be gone forever.',
           $blog->getName()))
       ->addSubmitButton(pht('Delete'))
       ->addCancelButton($cancel_uri);
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
+
 }
diff --git a/src/applications/phame/controller/blog/PhameBlogFeedController.php b/src/applications/phame/controller/blog/PhameBlogFeedController.php
index c855932ab5..d239650638 100644
--- a/src/applications/phame/controller/blog/PhameBlogFeedController.php
+++ b/src/applications/phame/controller/blog/PhameBlogFeedController.php
@@ -1,107 +1,104 @@
 <?php
 
-/**
- * @group phame
- */
 final class PhameBlogFeedController extends PhameController {
 
   private $id;
 
   public function shouldRequireLogin() {
     return false;
   }
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $blog = id(new PhameBlogQuery())
       ->setViewer($user)
       ->withIDs(array($this->id))
       ->executeOne();
     if (!$blog) {
       return new Aphront404Response();
     }
 
     $posts = id(new PhamePostQuery())
       ->setViewer($user)
       ->withBlogPHIDs(array($blog->getPHID()))
       ->withVisibility(PhamePost::VISIBILITY_PUBLISHED)
       ->execute();
 
     $blog_uri = PhabricatorEnv::getProductionURI(
       $this->getApplicationURI('blog/feed/'.$blog->getID().'/'));
     $content = array();
     $content[] = phutil_tag('title', array(), $blog->getName());
     $content[] = phutil_tag('id', array(), $blog_uri);
     $content[] = phutil_tag('link',
       array(
         'rel' => 'self',
         'type' => 'application/atom+xml',
         'href' => $blog_uri
       ));
 
     $updated = $blog->getDateModified();
     if ($posts) {
       $updated = max($updated, max(mpull($posts, 'getDateModified')));
     }
     $content[] = phutil_tag('updated', array(), date('c', $updated));
 
     $description = $blog->getDescription();
     if ($description != '') {
       $content[] = phutil_tag('subtitle', array(), $description);
     }
 
     $engine = id(new PhabricatorMarkupEngine())->setViewer($user);
     foreach ($posts as $post) {
       $engine->addObject($post, PhamePost::MARKUP_FIELD_BODY);
     }
     $engine->process();
 
     $blogger_phids = mpull($posts, 'getBloggerPHID');
     $bloggers = id(new PhabricatorHandleQuery())
       ->setViewer($user)
       ->withPHIDs($blogger_phids)
       ->execute();
 
     foreach ($posts as $post) {
       $content[] = hsprintf('<entry>');
       $content[] = phutil_tag('title', array(), $post->getTitle());
       $content[] = phutil_tag('link', array('href' => $post->getViewURI()));
 
       $content[] = phutil_tag('id', array(), PhabricatorEnv::getProductionURI(
         '/phame/post/view/'.$post->getID().'/'));
 
       $content[] = hsprintf(
         '<author><name>%s</name></author>',
         $bloggers[$post->getBloggerPHID()]->getFullName());
 
       $content[] = phutil_tag(
         'updated',
         array(),
         date('c', $post->getDateModified()));
 
       $content[] = hsprintf(
         '<content type="xhtml">'.
         '<div xmlns="http://www.w3.org/1999/xhtml">%s</div>'.
         '</content>',
         $engine->getOutput($post, PhamePost::MARKUP_FIELD_BODY));
 
       $content[] = hsprintf('</entry>');
     }
 
     $content = phutil_tag(
       'feed',
       array('xmlns' => 'http://www.w3.org/2005/Atom'),
       $content);
 
     return id(new AphrontFileResponse())
       ->setMimeType('application/xml')
       ->setContent($content);
   }
 
 }
diff --git a/src/applications/phame/controller/blog/PhameBlogListController.php b/src/applications/phame/controller/blog/PhameBlogListController.php
index 3e6459dd21..70fc5307a3 100644
--- a/src/applications/phame/controller/blog/PhameBlogListController.php
+++ b/src/applications/phame/controller/blog/PhameBlogListController.php
@@ -1,87 +1,84 @@
 <?php
 
-/**
- * @group phame
- */
 final class PhameBlogListController extends PhameController {
 
   private $filter;
 
   public function willProcessRequest(array $data) {
     $this->filter = idx($data, 'filter');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $nav = $this->renderSideNavFilterView(null);
     $filter = $nav->selectFilter('blog/'.$this->filter, 'blog/user');
 
     $query = id(new PhameBlogQuery())
       ->setViewer($user);
 
     switch ($filter) {
       case 'blog/all':
         $title = pht('All Blogs');
         $nodata = pht('No blogs have been created.');
         break;
       case 'blog/user':
         $title = pht('Joinable Blogs');
         $nodata = pht('There are no blogs you can contribute to.');
         $query->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_JOIN,
           ));
         break;
       default:
         throw new Exception("Unknown filter '{$filter}'!");
     }
 
     $pager = id(new AphrontPagerView())
       ->setURI($request->getRequestURI(), 'offset')
       ->setOffset($request->getInt('offset'));
 
     $blogs = $query->executeWithOffsetPager($pager);
 
     $blog_list = $this->renderBlogList($blogs, $user, $nodata);
     $blog_list->setPager($pager);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($title, $this->getApplicationURI());
 
     $nav->appendChild(
       array(
         $crumbs,
         $blog_list,
       ));
 
     return $this->buildApplicationPage(
       $nav,
       array(
         'title' => $title,
       ));
   }
 
   private function renderBlogList(
     array $blogs,
     PhabricatorUser $user,
     $nodata) {
 
     $view = new PHUIObjectItemListView();
     $view->setNoDataString($nodata);
     $view->setUser($user);
     foreach ($blogs as $blog) {
 
       $item = id(new PHUIObjectItemView())
         ->setHeader($blog->getName())
         ->setHref($this->getApplicationURI('blog/view/'.$blog->getID().'/'))
         ->setObject($blog);
 
       $view->addItem($item);
     }
 
     return $view;
   }
 
 }
diff --git a/src/applications/phame/controller/blog/PhameBlogLiveController.php b/src/applications/phame/controller/blog/PhameBlogLiveController.php
index 3fe3073c99..e55b2e0f35 100644
--- a/src/applications/phame/controller/blog/PhameBlogLiveController.php
+++ b/src/applications/phame/controller/blog/PhameBlogLiveController.php
@@ -1,74 +1,71 @@
 <?php
 
-/**
- * @group phame
- */
 final class PhameBlogLiveController extends PhameController {
 
   private $id;
   private $more;
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function willProcessRequest(array $data) {
     $this->id = idx($data, 'id');
     $this->more = idx($data, 'more', '');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $blog = id(new PhameBlogQuery())
       ->setViewer($user)
       ->withIDs(array($this->id))
       ->executeOne();
     if (!$blog) {
       return new Aphront404Response();
     }
 
     if ($blog->getDomain() && ($request->getHost() != $blog->getDomain())) {
       $base_uri = $blog->getLiveURI();
 
       // Don't redirect directly, since the domain is user-controlled and there
       // are a bevy of security issues associated with automatic redirects to
       // external domains.
 
       // Previously we CSRF'd this and someone found a way to pass OAuth
       // information through it using anchors. Just make users click a normal
       // link so that this is no more dangerous than any other external link
       // on the site.
 
       $dialog = id(new AphrontDialogView())
         ->setTitle(pht('Blog Moved'))
         ->setUser($user)
         ->appendParagraph(pht('This blog is now hosted here:'))
         ->appendParagraph(
           phutil_tag(
             'a',
             array(
               'href' => $base_uri,
             ),
             $base_uri))
         ->addCancelButton('/');
 
       return id(new AphrontDialogResponse())->setDialog($dialog);
     }
 
     $phame_request = clone $request;
     $phame_request->setPath('/'.ltrim($this->more, '/'));
 
     $uri = $blog->getLiveURI();
 
     $skin = $blog->getSkinRenderer($phame_request);
     $skin
       ->setBlog($blog)
       ->setBaseURI($uri);
 
     $skin->willProcessRequest(array());
     return $skin->processRequest();
   }
 
 }
diff --git a/src/applications/phame/controller/blog/PhameBlogViewController.php b/src/applications/phame/controller/blog/PhameBlogViewController.php
index d5ceae13d8..c99a38edad 100644
--- a/src/applications/phame/controller/blog/PhameBlogViewController.php
+++ b/src/applications/phame/controller/blog/PhameBlogViewController.php
@@ -1,194 +1,190 @@
 <?php
 
-/**
- * @group phame
- */
 final class PhameBlogViewController extends PhameController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $blog = id(new PhameBlogQuery())
       ->setViewer($user)
       ->withIDs(array($this->id))
       ->executeOne();
     if (!$blog) {
       return new Aphront404Response();
     }
 
     $pager = id(new AphrontCursorPagerView())
       ->readFromRequest($request);
 
     $posts = id(new PhamePostQuery())
       ->setViewer($user)
       ->withBlogPHIDs(array($blog->getPHID()))
       ->executeWithCursorPager($pager);
 
     $nav = $this->renderSideNavFilterView(null);
 
     $header = id(new PHUIHeaderView())
       ->setHeader($blog->getName())
       ->setUser($user)
       ->setPolicyObject($blog);
 
     $handle_phids = array_merge(
       mpull($posts, 'getBloggerPHID'),
       mpull($posts, 'getBlogPHID'));
     $this->loadHandles($handle_phids);
 
     $actions = $this->renderActions($blog, $user);
     $properties = $this->renderProperties($blog, $user, $actions);
     $post_list = $this->renderPostList(
       $posts,
       $user,
       pht('This blog has no visible posts.'));
 
     require_celerity_resource('phame-css');
     $post_list = id(new PHUIBoxView())
       ->addPadding(PHUI::PADDING_LARGE)
       ->addClass('phame-post-list')
       ->appendChild($post_list);
 
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($blog->getName(), $this->getApplicationURI());
 
     $object_box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->addPropertyList($properties);
 
     $nav->appendChild(
       array(
         $crumbs,
         $object_box,
         $post_list,
       ));
 
     return $this->buildApplicationPage(
       $nav,
       array(
         'title' => $blog->getName(),
       ));
   }
 
   private function renderProperties(
     PhameBlog $blog,
     PhabricatorUser $user,
     PhabricatorActionListView $actions) {
 
     require_celerity_resource('aphront-tooltip-css');
     Javelin::initBehavior('phabricator-tooltips');
 
     $properties = new PHUIPropertyListView();
     $properties->setActionList($actions);
 
     $properties->addProperty(
       pht('Skin'),
       $blog->getSkin());
 
     $properties->addProperty(
       pht('Domain'),
       $blog->getDomain());
 
     $feed_uri = PhabricatorEnv::getProductionURI(
       $this->getApplicationURI('blog/feed/'.$blog->getID().'/'));
     $properties->addProperty(
       pht('Atom URI'),
       javelin_tag('a',
         array(
           'href' => $feed_uri,
           'sigil' => 'has-tooltip',
           'meta' => array(
             'tip' => pht('Atom URI does not support custom domains.'),
             'size' => 320,
           )
         ),
         $feed_uri));
 
     $descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
       $user,
       $blog);
 
     $properties->addProperty(
       pht('Editable By'),
       $descriptions[PhabricatorPolicyCapability::CAN_EDIT]);
 
     $properties->addProperty(
       pht('Joinable By'),
       $descriptions[PhabricatorPolicyCapability::CAN_JOIN]);
 
     $engine = id(new PhabricatorMarkupEngine())
       ->setViewer($user)
       ->addObject($blog, PhameBlog::MARKUP_FIELD_DESCRIPTION)
       ->process();
 
     $properties->addTextContent(
       phutil_tag(
         'div',
         array(
           'class' => 'phabricator-remarkup',
         ),
         $engine->getOutput($blog, PhameBlog::MARKUP_FIELD_DESCRIPTION)));
 
     return $properties;
   }
 
   private function renderActions(PhameBlog $blog, PhabricatorUser $user) {
-
     $actions = id(new PhabricatorActionListView())
       ->setObject($blog)
       ->setObjectURI($this->getRequest()->getRequestURI())
       ->setUser($user);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $user,
       $blog,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $can_join = PhabricatorPolicyFilter::hasCapability(
       $user,
       $blog,
       PhabricatorPolicyCapability::CAN_JOIN);
 
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-plus')
         ->setHref($this->getApplicationURI('post/edit/?blog='.$blog->getID()))
         ->setName(pht('Write Post'))
         ->setDisabled(!$can_join)
         ->setWorkflow(!$can_join));
 
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setUser($user)
         ->setIcon('fa-globe')
         ->setHref($blog->getLiveURI())
         ->setName(pht('View Live')));
 
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-pencil')
         ->setHref($this->getApplicationURI('blog/edit/'.$blog->getID().'/'))
         ->setName('Edit Blog')
         ->setDisabled(!$can_edit)
         ->setWorkflow(!$can_edit));
 
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-times')
         ->setHref($this->getApplicationURI('blog/delete/'.$blog->getID().'/'))
         ->setName('Delete Blog')
         ->setDisabled(!$can_edit)
         ->setWorkflow(true));
 
     return $actions;
   }
 
 }
diff --git a/src/applications/phame/controller/post/PhamePostDeleteController.php b/src/applications/phame/controller/post/PhamePostDeleteController.php
index 8faa715a5e..a02c0e1cff 100644
--- a/src/applications/phame/controller/post/PhamePostDeleteController.php
+++ b/src/applications/phame/controller/post/PhamePostDeleteController.php
@@ -1,50 +1,48 @@
 <?php
 
-/**
- * @group phame
- */
 final class PhamePostDeleteController extends PhameController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $post = id(new PhamePostQuery())
       ->setViewer($user)
       ->withIDs(array($this->id))
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->executeOne();
     if (!$post) {
       return new Aphront404Response();
     }
 
     if ($request->isFormPost()) {
       $post->delete();
       return id(new AphrontRedirectResponse())
         ->setURI('/phame/post/');
     }
 
     $cancel_uri = $this->getApplicationURI('/post/view/'.$post->getID().'/');
 
     $dialog = id(new AphrontDialogView())
       ->setUser($user)
       ->setTitle(pht('Delete Post?'))
       ->appendChild(
         pht(
           'Really delete the post "%s"? It will be gone forever.',
           $post->getTitle()))
       ->addSubmitButton(pht('Delete'))
       ->addCancelButton($cancel_uri);
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
+
 }
diff --git a/src/applications/phame/controller/post/PhamePostEditController.php b/src/applications/phame/controller/post/PhamePostEditController.php
index ee407d5d47..165ec3894a 100644
--- a/src/applications/phame/controller/post/PhamePostEditController.php
+++ b/src/applications/phame/controller/post/PhamePostEditController.php
@@ -1,191 +1,187 @@
 <?php
 
-/**
- * @group phame
- */
-final class PhamePostEditController
-  extends PhameController {
+final class PhamePostEditController extends PhameController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = idx($data, 'id');
   }
 
   public function processRequest() {
     $request       = $this->getRequest();
     $user          = $request->getUser();
 
     if ($this->id) {
       $post = id(new PhamePostQuery())
         ->setViewer($user)
         ->withIDs(array($this->id))
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_EDIT,
           ))
         ->executeOne();
       if (!$post) {
         return new Aphront404Response();
       }
 
       $cancel_uri = $this->getApplicationURI('/post/view/'.$this->id.'/');
       $submit_button = pht('Save Changes');
       $page_title = pht('Edit Post');
     } else {
       $blog = id(new PhameBlogQuery())
         ->setViewer($user)
         ->withIDs(array($request->getInt('blog')))
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_VIEW,
             PhabricatorPolicyCapability::CAN_JOIN,
           ))
         ->executeOne();
       if (!$blog) {
         return new Aphront404Response();
       }
 
       $post = PhamePost::initializePost($user, $blog);
       $cancel_uri = $this->getApplicationURI('/blog/view/'.$blog->getID().'/');
 
       $submit_button = pht('Save Draft');
       $page_title    = pht('Create Post');
     }
 
     $e_phame_title = null;
     $e_title       = true;
     $errors        = array();
 
     if ($request->isFormPost()) {
       $comments    = $request->getStr('comments_widget');
       $data        = array('comments_widget' => $comments);
       $phame_title = $request->getStr('phame_title');
       $phame_title = PhabricatorSlug::normalize($phame_title);
       $title       = $request->getStr('title');
       $post->setTitle($title);
       $post->setPhameTitle($phame_title);
       $post->setBody($request->getStr('body'));
       $post->setConfigData($data);
 
       if ($phame_title == '/') {
         $errors[]      = pht('Phame title must be nonempty.');
         $e_phame_title = pht('Required');
       }
 
       if (!strlen($title)) {
         $errors[] = pht('Title must be nonempty.');
         $e_title  = pht('Required');
       } else {
         $e_title = null;
       }
 
       if (!$errors) {
         try {
           $post->save();
 
           $uri = $this->getApplicationURI('/post/view/'.$post->getID().'/');
           return id(new AphrontRedirectResponse())->setURI($uri);
         } catch (AphrontQueryDuplicateKeyException $e) {
           $e_phame_title = pht('Not Unique');
           $errors[]      = pht('Another post already uses this slug. '.
                            'Each post must have a unique slug.');
         }
       }
     }
 
     $handle = id(new PhabricatorHandleQuery())
       ->setViewer($user)
       ->withPHIDs(array($post->getBlogPHID()))
       ->executeOne();
 
     $form = id(new AphrontFormView())
       ->setUser($user)
       ->addHiddenInput('blog', $request->getInt('blog'))
       ->appendChild(
         id(new AphrontFormMarkupControl())
           ->setLabel(pht('Blog'))
           ->setValue($handle->renderLink()))
       ->appendChild(
         id(new AphrontFormTextControl())
         ->setLabel(pht('Title'))
         ->setName('title')
         ->setValue($post->getTitle())
         ->setID('post-title')
         ->setError($e_title))
       ->appendChild(
         id(new AphrontFormTextControl())
         ->setLabel(pht('Phame Title'))
         ->setName('phame_title')
         ->setValue(rtrim($post->getPhameTitle(), '/'))
         ->setID('post-phame-title')
         ->setCaption(pht('Up to 64 alphanumeric characters '.
                      'with underscores for spaces. '.
                      'Formatting is enforced.'))
         ->setError($e_phame_title))
       ->appendChild(
         id(new PhabricatorRemarkupControl())
         ->setLabel(pht('Body'))
         ->setName('body')
         ->setValue($post->getBody())
         ->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_TALL)
         ->setID('post-body')
         ->setUser($user)
         ->setDisableMacros(true))
       ->appendChild(
         id(new AphrontFormSelectControl())
         ->setLabel(pht('Comments Widget'))
         ->setName('comments_widget')
         ->setvalue($post->getCommentsWidget())
         ->setOptions($post->getCommentsWidgetOptionsForSelect()))
       ->appendChild(
         id(new AphrontFormSubmitControl())
         ->addCancelButton($cancel_uri)
         ->setValue($submit_button));
 
     $loading = phutil_tag_div(
       'aphront-panel-preview-loading-text',
       pht('Loading preview...'));
 
     $preview_panel = phutil_tag_div('aphront-panel-preview', array(
       phutil_tag_div('phame-post-preview-header', pht('Post Preview')),
       phutil_tag('div', array('id' => 'post-preview'), $loading),
     ));
 
     require_celerity_resource('phame-css');
     Javelin::initBehavior(
       'phame-post-preview',
       array(
         'preview'     => 'post-preview',
         'body'        => 'post-body',
         'title'       => 'post-title',
         'phame_title' => 'post-phame-title',
         'uri'         => '/phame/post/preview/',
       ));
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText($page_title)
       ->setFormErrors($errors)
       ->setForm($form);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(
       $page_title,
       $this->getApplicationURI('/post/view/'.$this->id.'/'));
 
     $nav = $this->renderSideNavFilterView(null);
     $nav->appendChild(
       array(
         $crumbs,
         $form_box,
         $preview_panel,
       ));
 
     return $this->buildApplicationPage(
       $nav,
       array(
         'title' => $page_title,
       ));
   }
 
 }
diff --git a/src/applications/phame/controller/post/PhamePostFramedController.php b/src/applications/phame/controller/post/PhamePostFramedController.php
index 6b7569749c..635c120928 100644
--- a/src/applications/phame/controller/post/PhamePostFramedController.php
+++ b/src/applications/phame/controller/post/PhamePostFramedController.php
@@ -1,47 +1,45 @@
 <?php
 
-/**
- * @group phame
- */
 final class PhamePostFramedController extends PhameController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $post = id(new PhamePostQuery())
       ->setViewer($user)
       ->withIDs(array($this->id))
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->executeOne();
     if (!$post) {
       return new Aphront404Response();
     }
 
     $blog = $post->getBlog();
 
     $phame_request = $request->setPath('/post/'.$post->getPhameTitle());
     $skin = $post->getBlog()->getSkinRenderer($phame_request);
 
     $uri = clone $request->getRequestURI();
     $uri->setPath('/phame/live/'.$blog->getID().'/');
 
     $skin
       ->setPreview(true)
       ->setBlog($post->getBlog())
       ->setBaseURI((string)$uri);
 
     $response = $skin->processRequest();
     $response->setFrameable(true);
     return $response;
   }
+
 }
diff --git a/src/applications/phame/controller/post/PhamePostListController.php b/src/applications/phame/controller/post/PhamePostListController.php
index c7628742bd..d04436a02d 100644
--- a/src/applications/phame/controller/post/PhamePostListController.php
+++ b/src/applications/phame/controller/post/PhamePostListController.php
@@ -1,97 +1,93 @@
 <?php
 
-/**
- * @group phame
- */
 final class PhamePostListController extends PhameController {
 
   private $bloggername;
   private $filter;
 
   public function willProcessRequest(array $data) {
     $this->filter = idx($data, 'filter', 'blogger');
     $this->bloggername = idx($data, 'bloggername');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $query = id(new PhamePostQuery())
       ->setViewer($user);
 
     $nav = $this->renderSideNavFilterView();
 
     switch ($this->filter) {
       case 'draft':
         $query->withBloggerPHIDs(array($user->getPHID()));
         $query->withVisibility(PhamePost::VISIBILITY_DRAFT);
         $nodata = pht('You have no unpublished drafts.');
         $title = pht('Unpublished Drafts');
         $nav->selectFilter('post/draft');
         break;
       case 'blogger':
         if ($this->bloggername) {
           $blogger = id(new PhabricatorUser())->loadOneWhere(
             'username = %s',
             $this->bloggername);
           if (!$blogger) {
             return new Aphront404Response();
           }
         } else {
           $blogger = $user;
         }
 
         $query->withBloggerPHIDs(array($blogger->getPHID()));
         if ($blogger->getPHID() == $user->getPHID()) {
           $nav->selectFilter('post');
           $nodata = pht('You have not written any posts.');
         } else {
           $nodata = pht('%s has not written any posts.', $blogger);
         }
         $title = pht('Posts By %s', $blogger);
         break;
       case 'all':
         $nodata = pht('There are no visible posts.');
         $title = pht('Posts');
         $nav->selectFilter('post/all');
         break;
       default:
         throw new Exception("Unknown filter '{$this->filter}'!");
     }
 
     $pager = id(new AphrontCursorPagerView())
       ->readFromRequest($request);
 
     $posts = $query->executeWithCursorPager($pager);
 
     $handle_phids = array_merge(
       mpull($posts, 'getBloggerPHID'),
       mpull($posts, 'getBlogPHID'));
     $this->loadHandles($handle_phids);
 
     require_celerity_resource('phame-css');
     $post_list = $this->renderPostList($posts, $user, $nodata);
     $post_list = id(new PHUIBoxView())
       ->addPadding(PHUI::PADDING_LARGE)
       ->addClass('phame-post-list')
       ->appendChild($post_list);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($title, $this->getApplicationURI());
 
     $nav->appendChild(
       array(
         $crumbs,
         $post_list,
       ));
 
     return $this->buildApplicationPage(
       $nav,
       array(
         'title'   => $title,
       ));
   }
 
-
 }
diff --git a/src/applications/phame/controller/post/PhamePostNewController.php b/src/applications/phame/controller/post/PhamePostNewController.php
index 7299b93624..99e4b77e97 100644
--- a/src/applications/phame/controller/post/PhamePostNewController.php
+++ b/src/applications/phame/controller/post/PhamePostNewController.php
@@ -1,130 +1,128 @@
 <?php
 
-/**
- * @group phame
- */
 final class PhamePostNewController extends PhameController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = idx($data, 'id');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $post = null;
     $view_uri = null;
     if ($this->id) {
       $post = id(new PhamePostQuery())
         ->setViewer($user)
         ->withIDs(array($this->id))
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_EDIT,
           ))
         ->executeOne();
       if (!$post) {
         return new Aphront404Response();
       }
 
       $view_uri = '/post/view/'.$post->getID().'/';
       $view_uri = $this->getApplicationURI($view_uri);
 
       if ($request->isFormPost()) {
         $blog = id(new PhameBlogQuery())
           ->setViewer($user)
           ->withIDs(array($request->getInt('blog')))
           ->requireCapabilities(
             array(
               PhabricatorPolicyCapability::CAN_JOIN,
             ))
           ->executeOne();
 
         if ($blog) {
           $post->setBlogPHID($blog->getPHID());
           $post->save();
 
           return id(new AphrontRedirectResponse())->setURI($view_uri);
         }
       }
 
       $title = pht('Move Post');
     } else {
       $title = pht('Create Post');
       $view_uri = $this->getApplicationURI('/post/new');
     }
 
     $blogs = id(new PhameBlogQuery())
       ->setViewer($user)
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_JOIN,
         ))
       ->execute();
 
     $nav = $this->renderSideNavFilterView();
     $nav->selectFilter('post/new');
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($title, $view_uri);
     $nav->appendChild($crumbs);
 
     if (!$blogs) {
       $notification = id(new AphrontErrorView())
         ->setSeverity(AphrontErrorView::SEVERITY_NODATA)
         ->appendChild(
           pht('You do not have permission to join any blogs. Create a blog '.
               'first, then you can post to it.'));
 
       $nav->appendChild($notification);
     } else {
       $options = mpull($blogs, 'getName', 'getID');
       asort($options);
 
       $selected_value = null;
       if ($post && $post->getBlog()) {
         $selected_value = $post->getBlog()->getID();
       }
 
       $form = id(new AphrontFormView())
         ->setUser($user)
         ->appendChild(
           id(new AphrontFormSelectControl())
             ->setLabel(pht('Blog'))
             ->setName('blog')
             ->setOptions($options)
             ->setValue($selected_value));
 
       if ($post) {
         $form
           ->appendChild(
             id(new AphrontFormSubmitControl())
               ->setValue(pht('Move Post'))
               ->addCancelButton($view_uri));
       } else {
         $form
           ->setAction($this->getApplicationURI('post/edit/'))
           ->setMethod('GET')
           ->appendChild(
             id(new AphrontFormSubmitControl())
               ->setValue(pht('Continue')));
       }
 
 
       $form_box = id(new PHUIObjectBoxView())
         ->setHeaderText($title)
         ->setForm($form);
 
       $nav->appendChild($form_box);
     }
 
     return $this->buildApplicationPage(
       $nav,
       array(
         'title'   => $title,
       ));
   }
+
 }
diff --git a/src/applications/phame/controller/post/PhamePostNotLiveController.php b/src/applications/phame/controller/post/PhamePostNotLiveController.php
index 885bc3b1a9..8cfddb8436 100644
--- a/src/applications/phame/controller/post/PhamePostNotLiveController.php
+++ b/src/applications/phame/controller/post/PhamePostNotLiveController.php
@@ -1,60 +1,58 @@
 <?php
 
-/**
- * @group phame
- */
 final class PhamePostNotLiveController extends PhameController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $post = id(new PhamePostQuery())
       ->setViewer($user)
       ->withIDs(array($this->id))
       ->executeOne();
     if (!$post) {
       return new Aphront404Response();
     }
 
     $reasons = array();
     if (!$post->getBlog()) {
       $reasons[] = phutil_tag('p', array(), pht(
         'You can not view the live version of this post because it '.
         'is not associated with a blog. Move the post to a blog in order to '.
         'view it live.'));
     }
 
     if ($post->isDraft()) {
       $reasons[] = phutil_tag('p', array(), pht(
         'You can not view the live version of this post because it '.
         'is still a draft. Use "Preview/Publish" to publish the post.'));
     }
 
     if ($reasons) {
       $cancel_uri = $this->getApplicationURI('/post/view/'.$post->getID().'/');
 
       $dialog = id(new AphrontDialogView())
         ->setUser($user)
         ->setTitle(pht('Post Not Live'))
         ->addCancelButton($cancel_uri);
 
       foreach ($reasons as $reason) {
         $dialog->appendChild($reason);
       }
 
       return id(new AphrontDialogResponse())->setDialog($dialog);
     }
 
     // No reason this can't go live, maybe an old link. Kick them live and see
     // what happens.
     $live_uri = $post->getViewURI();
     return id(new AphrontRedirectResponse())->setURI($live_uri);
   }
+
 }
diff --git a/src/applications/phame/controller/post/PhamePostPreviewController.php b/src/applications/phame/controller/post/PhamePostPreviewController.php
index 8353b98d72..5b87ec680b 100644
--- a/src/applications/phame/controller/post/PhamePostPreviewController.php
+++ b/src/applications/phame/controller/post/PhamePostPreviewController.php
@@ -1,30 +1,27 @@
 <?php
 
-/**
- * @group phame
- */
-final class PhamePostPreviewController
-extends PhameController {
+final class PhamePostPreviewController extends PhameController {
 
   protected function getSideNavFilter() {
     return null;
   }
 
   public function processRequest() {
     $request     = $this->getRequest();
     $user        = $request->getUser();
     $body        = $request->getStr('body');
 
     $post = id(new PhamePost())
       ->setBody($body);
 
     $content = PhabricatorMarkupEngine::renderOneObject(
       $post,
       PhamePost::MARKUP_FIELD_BODY,
       $user);
 
     $content = phutil_tag_div('phabricator-remarkup', $content);
 
     return id(new AphrontAjaxResponse())->setContent($content);
   }
+
 }
diff --git a/src/applications/phame/controller/post/PhamePostPublishController.php b/src/applications/phame/controller/post/PhamePostPublishController.php
index 78131df28f..fcc7b29dc8 100644
--- a/src/applications/phame/controller/post/PhamePostPublishController.php
+++ b/src/applications/phame/controller/post/PhamePostPublishController.php
@@ -1,89 +1,87 @@
 <?php
 
-/**
- * @group phame
- */
 final class PhamePostPublishController extends PhameController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $post = id(new PhamePostQuery())
       ->setViewer($user)
       ->withIDs(array($this->id))
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->executeOne();
     if (!$post) {
       return new Aphront404Response();
     }
 
     $view_uri = $this->getApplicationURI('/post/view/'.$post->getID().'/');
 
     if ($request->isFormPost()) {
       $post->setVisibility(PhamePost::VISIBILITY_PUBLISHED);
       $post->setDatePublished(time());
       $post->save();
 
       return id(new AphrontRedirectResponse())->setURI($view_uri);
     }
 
     $form = id(new AphrontFormView())
       ->setUser($user)
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Publish Post'))
           ->addCancelButton($view_uri));
 
     $frame = $this->renderPreviewFrame($post);
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Preview Post'))
       ->setForm($form);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Preview'), $view_uri);
 
     $nav = $this->renderSideNavFilterView(null);
     $nav->appendChild(
       array(
         $crumbs,
         $form_box,
         $frame,
       ));
 
     return $this->buildApplicationPage(
       $nav,
       array(
         'title'   => pht('Preview Post'),
       ));
   }
 
   private function renderPreviewFrame(PhamePost $post) {
 
     // TODO: Clean up this CSS.
 
     return phutil_tag(
       'div',
       array(
         'style' => 'text-align: center; padding: 1em;',
       ),
       phutil_tag(
         'iframe',
         array(
           'style' => 'width: 100%; height: 600px; '.
                      'border: 1px solid #303030;',
           'src' => $this->getApplicationURI('/post/framed/'.$post->getID().'/'),
         ),
         ''));
   }
+
 }
diff --git a/src/applications/phame/controller/post/PhamePostUnpublishController.php b/src/applications/phame/controller/post/PhamePostUnpublishController.php
index f70cff773c..52c29da120 100644
--- a/src/applications/phame/controller/post/PhamePostUnpublishController.php
+++ b/src/applications/phame/controller/post/PhamePostUnpublishController.php
@@ -1,54 +1,52 @@
 <?php
 
-/**
- * @group phame
- */
 final class PhamePostUnpublishController extends PhameController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $post = id(new PhamePostQuery())
       ->setViewer($user)
       ->withIDs(array($this->id))
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->executeOne();
     if (!$post) {
       return new Aphront404Response();
     }
 
     if ($request->isFormPost()) {
       $post->setVisibility(PhamePost::VISIBILITY_DRAFT);
       $post->setDatePublished(0);
       $post->save();
 
       return id(new AphrontRedirectResponse())
         ->setURI($this->getApplicationURI('/post/view/'.$post->getID().'/'));
     }
 
     $cancel_uri = $this->getApplicationURI('/post/view/'.$post->getID().'/');
 
     $dialog = id(new AphrontDialogView())
       ->setUser($user)
       ->setTitle(pht('Unpublish Post?'))
       ->appendChild(
         pht(
           'The post "%s" will no longer be visible to other users until you '.
           'republish it.',
           $post->getTitle()))
       ->addSubmitButton(pht('Unpublish'))
       ->addCancelButton($cancel_uri);
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
+
 }
diff --git a/src/applications/phame/controller/post/PhamePostViewController.php b/src/applications/phame/controller/post/PhamePostViewController.php
index b87cc28493..7c12ba5565 100644
--- a/src/applications/phame/controller/post/PhamePostViewController.php
+++ b/src/applications/phame/controller/post/PhamePostViewController.php
@@ -1,206 +1,204 @@
 <?php
 
-/**
- * @group phame
- */
 final class PhamePostViewController extends PhameController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $post = id(new PhamePostQuery())
       ->setViewer($user)
       ->withIDs(array($this->id))
       ->executeOne();
 
     if (!$post) {
       return new Aphront404Response();
     }
 
     $nav = $this->renderSideNavFilterView();
 
     $this->loadHandles(
       array(
         $post->getBlogPHID(),
         $post->getBloggerPHID(),
       ));
     $actions = $this->renderActions($post, $user);
     $properties = $this->renderProperties($post, $user, $actions);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->setActionList($actions);
     $crumbs->addTextCrumb(
       $post->getTitle(),
       $this->getApplicationURI('post/view/'.$post->getID().'/'));
 
     $nav->appendChild($crumbs);
 
     $header = id(new PHUIHeaderView())
         ->setHeader($post->getTitle())
         ->setUser($user)
         ->setPolicyObject($post);
 
     $object_box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->addPropertyList($properties);
 
     if ($post->isDraft()) {
       $object_box->appendChild(
         id(new AphrontErrorView())
           ->setSeverity(AphrontErrorView::SEVERITY_NOTICE)
           ->setTitle(pht('Draft Post'))
           ->appendChild(
             pht('Only you can see this draft until you publish it. '.
                 'Use "Preview / Publish" to publish this post.')));
     }
 
     if (!$post->getBlog()) {
       $object_box->appendChild(
         id(new AphrontErrorView())
           ->setSeverity(AphrontErrorView::SEVERITY_WARNING)
           ->setTitle(pht('Not On A Blog'))
           ->appendChild(
             pht('This post is not associated with a blog (the blog may have '.
                 'been deleted). Use "Move Post" to move it to a new blog.')));
     }
 
     $nav->appendChild(
       array(
         $object_box,
       ));
 
     return $this->buildApplicationPage(
       $nav,
       array(
         'title' => $post->getTitle(),
       ));
   }
 
   private function renderActions(
     PhamePost $post,
     PhabricatorUser $user) {
 
     $actions = id(new PhabricatorActionListView())
       ->setObject($post)
       ->setObjectURI($this->getRequest()->getRequestURI())
       ->setUser($user);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $user,
       $post,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $id = $post->getID();
 
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-pencil')
         ->setHref($this->getApplicationURI('post/edit/'.$id.'/'))
         ->setName(pht('Edit Post'))
         ->setDisabled(!$can_edit)
         ->setWorkflow(!$can_edit));
 
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-arrows')
         ->setHref($this->getApplicationURI('post/move/'.$id.'/'))
         ->setName(pht('Move Post'))
         ->setDisabled(!$can_edit)
         ->setWorkflow(!$can_edit));
 
     if ($post->isDraft()) {
       $actions->addAction(
         id(new PhabricatorActionView())
           ->setIcon('fa-eye')
           ->setHref($this->getApplicationURI('post/publish/'.$id.'/'))
           ->setName(pht('Preview / Publish')));
     } else {
       $actions->addAction(
         id(new PhabricatorActionView())
           ->setIcon('fa-eye-slash')
           ->setHref($this->getApplicationURI('post/unpublish/'.$id.'/'))
           ->setName(pht('Unpublish'))
           ->setWorkflow(true));
     }
 
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-times')
         ->setHref($this->getApplicationURI('post/delete/'.$id.'/'))
         ->setName(pht('Delete Post'))
         ->setDisabled(!$can_edit)
         ->setWorkflow(true));
 
     $blog = $post->getBlog();
     $can_view_live = $blog && !$post->isDraft();
 
     if ($can_view_live) {
       $live_uri = $blog->getLiveURI($post);
     } else {
       $live_uri = 'post/notlive/'.$post->getID().'/';
       $live_uri = $this->getApplicationURI($live_uri);
     }
 
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setUser($user)
         ->setIcon('fa-globe')
         ->setHref($live_uri)
         ->setName(pht('View Live'))
         ->setDisabled(!$can_view_live)
         ->setWorkflow(!$can_view_live));
 
     return $actions;
   }
 
   private function renderProperties(
     PhamePost $post,
     PhabricatorUser $user,
     PhabricatorActionListView $actions) {
 
     $properties = id(new PHUIPropertyListView())
       ->setUser($user)
       ->setObject($post)
       ->setActionList($actions);
 
     $properties->addProperty(
       pht('Blog'),
       $post->getBlogPHID()
         ? $this->getHandle($post->getBlogPHID())->renderLink()
         : null);
 
     $properties->addProperty(
       pht('Blogger'),
       $this->getHandle($post->getBloggerPHID())->renderLink());
 
     $properties->addProperty(
       pht('Published'),
       $post->isDraft()
         ? pht('Draft')
         : phabricator_datetime($post->getDatePublished(), $user));
 
     $engine = id(new PhabricatorMarkupEngine())
       ->setViewer($user)
       ->addObject($post, PhamePost::MARKUP_FIELD_BODY)
       ->process();
 
     $properties->invokeWillRenderEvent();
 
     $properties->addTextContent(
       phutil_tag(
          'div',
         array(
           'class' => 'phabricator-remarkup',
         ),
         $engine->getOutput($post, PhamePost::MARKUP_FIELD_BODY)));
 
     return $properties;
   }
+
 }
diff --git a/src/applications/phame/phid/PhabricatorPhamePHIDTypeBlog.php b/src/applications/phame/phid/PhabricatorPhamePHIDTypeBlog.php
index bf20c112e0..633182dd14 100644
--- a/src/applications/phame/phid/PhabricatorPhamePHIDTypeBlog.php
+++ b/src/applications/phame/phid/PhabricatorPhamePHIDTypeBlog.php
@@ -1,43 +1,40 @@
 <?php
 
-/**
- * @group phame
- */
 final class PhabricatorPhamePHIDTypeBlog extends PhabricatorPHIDType {
 
   const TYPECONST = 'BLOG';
 
   public function getTypeConstant() {
     return self::TYPECONST;
   }
 
   public function getTypeName() {
     return pht('Phame Blog');
   }
 
   public function newObject() {
     return new PhameBlog();
   }
 
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhameBlogQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $blog = $objects[$phid];
       $handle->setName($blog->getName());
       $handle->setFullName($blog->getName());
       $handle->setURI('/phame/blog/view/'.$blog->getID().'/');
     }
   }
 
 }
diff --git a/src/applications/phame/phid/PhabricatorPhamePHIDTypePost.php b/src/applications/phame/phid/PhabricatorPhamePHIDTypePost.php
index 32ecbc231c..240851a9c3 100644
--- a/src/applications/phame/phid/PhabricatorPhamePHIDTypePost.php
+++ b/src/applications/phame/phid/PhabricatorPhamePHIDTypePost.php
@@ -1,43 +1,40 @@
 <?php
 
-/**
- * @group phame
- */
 final class PhabricatorPhamePHIDTypePost extends PhabricatorPHIDType {
 
   const TYPECONST = 'POST';
 
   public function getTypeConstant() {
     return self::TYPECONST;
   }
 
   public function getTypeName() {
     return pht('Phame Post');
   }
 
   public function newObject() {
     return new PhamePost();
   }
 
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhamePostQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $post = $objects[$phid];
       $handle->setName($post->getTitle());
       $handle->setFullName($post->getTitle());
       $handle->setURI('/phame/post/view/'.$post->getID().'/');
     }
   }
 
 }
diff --git a/src/applications/phame/query/PhameBlogQuery.php b/src/applications/phame/query/PhameBlogQuery.php
index eb253de6f5..160749a18f 100644
--- a/src/applications/phame/query/PhameBlogQuery.php
+++ b/src/applications/phame/query/PhameBlogQuery.php
@@ -1,83 +1,80 @@
 <?php
 
-/**
- * @group phame
- */
 final class PhameBlogQuery extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $ids;
   private $phids;
   private $domain;
   private $needBloggers;
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
     return $this;
   }
 
   public function withPHIDs(array $phids) {
     $this->phids = $phids;
     return $this;
   }
 
   public function withDomain($domain) {
     $this->domain = $domain;
     return $this;
   }
 
   protected function loadPage() {
     $table  = new PhameBlog();
     $conn_r = $table->establishConnection('r');
 
     $where_clause = $this->buildWhereClause($conn_r);
     $order_clause = $this->buildOrderClause($conn_r);
     $limit_clause = $this->buildLimitClause($conn_r);
 
     $data = queryfx_all(
       $conn_r,
       'SELECT * FROM %T b %Q %Q %Q',
       $table->getTableName(),
       $where_clause,
       $order_clause,
       $limit_clause);
 
     $blogs = $table->loadAllFromArray($data);
 
     return $blogs;
   }
 
   private function buildWhereClause($conn_r) {
     $where = array();
 
     if ($this->ids) {
       $where[] = qsprintf(
         $conn_r,
         'id IN (%Ls)',
         $this->ids);
     }
 
     if ($this->phids) {
       $where[] = qsprintf(
         $conn_r,
         'phid IN (%Ls)',
         $this->phids);
     }
 
     if ($this->domain) {
       $where[] = qsprintf(
         $conn_r,
         'domain = %s',
         $this->domain);
     }
 
     $where[] = $this->buildPagingClause($conn_r);
 
     return $this->formatWhereClause($where);
   }
 
   public function getQueryApplicationClass() {
     // TODO: Can we set this without breaking public blogs?
     return null;
   }
 
 }
diff --git a/src/applications/phame/query/PhamePostQuery.php b/src/applications/phame/query/PhamePostQuery.php
index 94430990d4..d87c26e35e 100644
--- a/src/applications/phame/query/PhamePostQuery.php
+++ b/src/applications/phame/query/PhamePostQuery.php
@@ -1,149 +1,146 @@
 <?php
 
-/**
- * @group phame
- */
 final class PhamePostQuery extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $ids;
   private $blogPHIDs;
   private $bloggerPHIDs;
   private $phameTitles;
   private $visibility;
   private $publishedAfter;
   private $phids;
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
     return $this;
   }
 
   public function withPHIDs(array $phids) {
     $this->phids = $phids;
     return $this;
   }
 
   public function withBloggerPHIDs(array $blogger_phids) {
     $this->bloggerPHIDs = $blogger_phids;
     return $this;
   }
 
   public function withBlogPHIDs(array $blog_phids) {
     $this->blogPHIDs = $blog_phids;
     return $this;
   }
 
   public function withPhameTitles(array $phame_titles) {
     $this->phameTitles = $phame_titles;
     return $this;
   }
 
   public function withVisibility($visibility) {
     $this->visibility = $visibility;
     return $this;
   }
 
   public function withPublishedAfter($time) {
     $this->publishedAfter = $time;
     return $this;
   }
 
   protected function loadPage() {
     $table  = new PhamePost();
     $conn_r = $table->establishConnection('r');
 
     $where_clause = $this->buildWhereClause($conn_r);
     $order_clause = $this->buildOrderClause($conn_r);
     $limit_clause = $this->buildLimitClause($conn_r);
 
     $data = queryfx_all(
       $conn_r,
       'SELECT * FROM %T p %Q %Q %Q',
       $table->getTableName(),
       $where_clause,
       $order_clause,
       $limit_clause);
 
     $posts = $table->loadAllFromArray($data);
 
     if ($posts) {
       // We require these to do visibility checks, so load them unconditionally.
       $blog_phids = mpull($posts, 'getBlogPHID');
       $blogs = id(new PhameBlogQuery())
         ->setViewer($this->getViewer())
         ->withPHIDs($blog_phids)
         ->execute();
       $blogs = mpull($blogs, null, 'getPHID');
       foreach ($posts as $post) {
         if (isset($blogs[$post->getBlogPHID()])) {
           $post->setBlog($blogs[$post->getBlogPHID()]);
         }
       }
     }
 
     return $posts;
   }
 
   private function buildWhereClause(AphrontDatabaseConnection $conn_r) {
     $where = array();
 
     if ($this->ids) {
       $where[] = qsprintf(
         $conn_r,
         'p.id IN (%Ld)',
         $this->ids);
     }
 
     if ($this->phids) {
       $where[] = qsprintf(
         $conn_r,
         'p.phid IN (%Ls)',
         $this->phids);
     }
 
     if ($this->bloggerPHIDs) {
       $where[] = qsprintf(
         $conn_r,
         'p.bloggerPHID IN (%Ls)',
         $this->bloggerPHIDs);
     }
 
     if ($this->phameTitles) {
       $where[] = qsprintf(
         $conn_r,
         'p.phameTitle IN (%Ls)',
         $this->phameTitles);
     }
 
     if ($this->visibility !== null) {
       $where[] = qsprintf(
         $conn_r,
         'p.visibility = %d',
         $this->visibility);
     }
 
     if ($this->publishedAfter !== null) {
       $where[] = qsprintf(
         $conn_r,
         'p.datePublished > %d',
         $this->publishedAfter);
     }
 
     if ($this->blogPHIDs) {
       $where[] = qsprintf(
         $conn_r,
         'p.blogPHID in (%Ls)',
         $this->blogPHIDs);
     }
 
     $where[] = $this->buildPagingClause($conn_r);
 
     return $this->formatWhereClause($where);
   }
 
   public function getQueryApplicationClass() {
     // TODO: Does setting this break public blogs?
     return null;
   }
 
 }
diff --git a/src/applications/phame/skins/PhameBasicBlogSkin.php b/src/applications/phame/skins/PhameBasicBlogSkin.php
index b248bc6b92..efaa85ec8a 100644
--- a/src/applications/phame/skins/PhameBasicBlogSkin.php
+++ b/src/applications/phame/skins/PhameBasicBlogSkin.php
@@ -1,325 +1,324 @@
 <?php
 
 /**
  * @task  paging    Paging
  * @task  internal  Internals
- * @group phame
  */
 abstract class PhameBasicBlogSkin extends PhameBlogSkin {
 
   private $pager;
   private $title;
   private $description;
   private $oGType;
   private $uriPath;
 
   public function setURIPath($uri_path) {
     $this->uriPath = $uri_path;
     return $this;
   }
   public function getURIPath() {
     return $this->uriPath;
   }
 
   protected function setOGType($og_type) {
     $this->oGType = $og_type;
     return $this;
   }
   protected function getOGType() {
     return $this->oGType;
   }
 
   protected function setDescription($description) {
     $this->description = $description;
     return $this;
   }
   protected function getDescription() {
     return $this->description;
   }
 
   protected function setTitle($title) {
     $this->title = $title;
     return $this;
   }
   protected function getTitle() {
     return $this->title;
   }
 
   public function processRequest() {
     $request = $this->getRequest();
 
     $content = $this->renderContent($request);
 
     if (!$content) {
       $content = $this->render404Page();
     }
 
     $content = array(
       $this->renderHeader(),
       $content,
       $this->renderFooter(),
     );
 
     $view = id(new PhabricatorBarePageView())
       ->setRequest($request)
       ->setController($this)
       ->setDeviceReady(true)
       ->setTitle($this->getBlog()->getName());
 
     if ($this->getPreview()) {
       $view->setFrameable(true);
     }
 
 
     $view->appendChild($content);
 
     $response = new AphrontWebpageResponse();
     $response->setContent($view->render());
 
     return $response;
   }
 
   public function getSkinName() {
     return get_class($this);
   }
 
   abstract protected function renderHeader();
   abstract protected function renderFooter();
 
   protected function renderPostDetail(PhamePostView $post) {
     return $post;
   }
 
   protected function renderPostList(array $posts) {
     $summaries = array();
     foreach ($posts as $post) {
       $summaries[] = $post->renderWithSummary();
     }
 
     $list = phutil_tag(
       'div',
       array(
         'class' => 'phame-post-list',
       ),
       id(new AphrontNullView())->appendChild($summaries)->render());
 
     $pager = null;
     if ($this->renderOlderPageLink() || $this->renderNewerPageLink()) {
       $pager = phutil_tag(
         'div',
         array(
           'class' => 'phame-pager',
         ),
         array(
           $this->renderOlderPageLink(),
           $this->renderNewerPageLink(),
         ));
     }
 
     return array(
       $list,
       $pager,
     );
   }
 
   protected function render404Page() {
     return phutil_tag('h2', array(), pht('404 Not Found'));
   }
 
   final public function getResourceURI($resource) {
     $root = $this->getSpecification()->getRootDirectory();
     $path = $root.DIRECTORY_SEPARATOR.$resource;
 
     $data = Filesystem::readFile($path);
     $hash = PhabricatorHash::digest($data);
     $hash = substr($hash, 0, 6);
     $id = $this->getBlog()->getID();
 
     $uri = '/phame/r/'.$id.'/'.$hash.'/'.$resource;
     $uri = PhabricatorEnv::getCDNURI($uri);
 
     return $uri;
   }
 
 /* -(  Paging  )------------------------------------------------------------- */
 
 
   /**
    * @task paging
    */
   public function getPageSize() {
     return 100;
   }
 
 
   /**
    * @task paging
    */
   protected function getOlderPageURI() {
     if ($this->pager) {
       $next = $this->pager->getNextPageID();
       if ($next) {
         return $this->getURI('older/'.$next.'/');
       }
     }
     return null;
   }
 
 
   /**
    * @task paging
    */
   protected function renderOlderPageLink() {
     $uri = $this->getOlderPageURI();
     if (!$uri) {
       return null;
     }
     return phutil_tag(
       'a',
       array(
         'class' => 'phame-page-link phame-page-older',
         'href'  => $uri,
       ),
       pht("\xE2\x80\xB9 Older"));
   }
 
 
   /**
    * @task paging
    */
   protected function getNewerPageURI() {
     if ($this->pager) {
       $next = $this->pager->getPrevPageID();
       if ($next) {
         return $this->getURI('newer/'.$next.'/');
       }
     }
     return null;
   }
 
 
   /**
    * @task paging
    */
   protected function renderNewerPageLink() {
     $uri = $this->getNewerPageURI();
     if (!$uri) {
       return null;
     }
     return phutil_tag(
       'a',
       array(
         'class' => 'phame-page-link phame-page-newer',
         'href'  => $uri,
       ),
       pht("Newer \xE2\x80\xBA"));
   }
 
 
 /* -(  Internals  )---------------------------------------------------------- */
 
 
   /**
    * @task internal
    */
   protected function renderContent(AphrontRequest $request) {
     $user = $request->getUser();
 
     $matches = null;
     $path = $request->getPath();
     // default to the blog-wide values
     $this->setTitle($this->getBlog()->getName());
     $this->setDescription($this->getBlog()->getDescription());
     $this->setOGType('website');
     $this->setURIPath('');
     if (preg_match('@^/post/(?P<name>.*)$@', $path, $matches)) {
       $post = id(new PhamePostQuery())
         ->setViewer($user)
         ->withBlogPHIDs(array($this->getBlog()->getPHID()))
         ->withPhameTitles(array($matches['name']))
         ->executeOne();
 
       if ($post) {
         $description = $post->getMarkupText(PhamePost::MARKUP_FIELD_SUMMARY);
         $this->setTitle($post->getTitle());
         $this->setDescription($description);
         $this->setOGType('article');
         $this->setURIPath('post/'.$post->getPhameTitle());
         $view = head($this->buildPostViews(array($post)));
         return $this->renderPostDetail($view);
       }
     } else {
       $pager = new AphrontCursorPagerView();
 
       if (preg_match('@^/older/(?P<before>\d+)/$@', $path, $matches)) {
         $pager->setAfterID($matches['before']);
       } else if (preg_match('@^/newer/(?P<after>\d)/$@', $path, $matches)) {
         $pager->setBeforeID($matches['after']);
       } else if (preg_match('@^/$@', $path, $matches)) {
         // Just show the first page.
       } else {
         return null;
       }
 
       $pager->setPageSize($this->getPageSize());
 
       $posts = id(new PhamePostQuery())
         ->setViewer($user)
         ->withBlogPHIDs(array($this->getBlog()->getPHID()))
         ->executeWithCursorPager($pager);
 
       $this->pager = $pager;
 
       if ($posts) {
         $views = $this->buildPostViews($posts);
         return $this->renderPostList($views);
       }
     }
 
     return null;
   }
 
   private function buildPostViews(array $posts) {
     assert_instances_of($posts, 'PhamePost');
     $user = $this->getRequest()->getUser();
 
     $engine = id(new PhabricatorMarkupEngine())
       ->setViewer($user);
 
     $phids = array();
     foreach ($posts as $post) {
       $engine->addObject($post, PhamePost::MARKUP_FIELD_BODY);
       $engine->addObject($post, PhamePost::MARKUP_FIELD_SUMMARY);
 
       $phids[] = $post->getBloggerPHID();
     }
 
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($user)
       ->withPHIDs($phids)
       ->execute();
 
     $engine->process();
 
     $views = array();
     foreach ($posts as $post) {
       $view = id(new PhamePostView())
         ->setUser($user)
         ->setSkin($this)
         ->setPost($post)
         ->setBody($engine->getOutput($post, PhamePost::MARKUP_FIELD_BODY))
         ->setSummary($engine->getOutput($post, PhamePost::MARKUP_FIELD_SUMMARY))
         ->setAuthor($handles[$post->getBloggerPHID()]);
 
       $post->makeEphemeral();
       if (!$post->getDatePublished()) {
         $post->setDatePublished(time());
       }
 
       $views[] = $view;
     }
 
     return $views;
   }
 
 }
diff --git a/src/applications/phame/skins/PhameBasicTemplateBlogSkin.php b/src/applications/phame/skins/PhameBasicTemplateBlogSkin.php
index a6851b2f9a..2915237ae7 100644
--- a/src/applications/phame/skins/PhameBasicTemplateBlogSkin.php
+++ b/src/applications/phame/skins/PhameBasicTemplateBlogSkin.php
@@ -1,139 +1,136 @@
 <?php
 
-/**
- * @group phame
- */
 final class PhameBasicTemplateBlogSkin extends PhameBasicBlogSkin {
 
   private $cssResources;
 
   public function processRequest() {
     $root = dirname(phutil_get_library_root('phabricator'));
     require_once $root.'/support/phame/libskin.php';
 
     $this->cssResources = array();
     $css = $this->getPath('css/');
 
     if (Filesystem::pathExists($css)) {
       foreach (Filesystem::listDirectory($css) as $path) {
         if (!preg_match('/.css$/', $path)) {
           continue;
         }
         $this->cssResources[] = phutil_tag(
           'link',
           array(
             'rel'   => 'stylesheet',
             'type'  => 'text/css',
             'href'  => $this->getResourceURI('css/'.$path),
           ));
       }
     }
 
     $map = CelerityResourceMap::getNamedInstance('phabricator');
     $resource_symbol = 'syntax-highlighting-css';
     $resource_uri = $map->getURIForSymbol($resource_symbol);
 
     $this->cssResources[] = phutil_tag(
       'link',
       array(
         'rel'   => 'stylesheet',
         'type'  => 'text/css',
         'href'  => PhabricatorEnv::getCDNURI($resource_uri),
       ));
 
     $this->cssResources = phutil_implode_html("\n", $this->cssResources);
 
     $request = $this->getRequest();
     $content = $this->renderContent($request);
 
     if (!$content) {
       $content = $this->render404Page();
     }
 
     $content = array(
       $this->renderHeader(),
       $content,
       $this->renderFooter(),
     );
 
     $response = new AphrontWebpageResponse();
     $response->setContent(phutil_implode_html("\n", $content));
 
     return $response;
   }
 
   public function getCSSResources() {
     return $this->cssResources;
   }
 
   public function getName() {
     return $this->getSpecification()->getName();
   }
 
   public function getPath($to_file = null) {
     $path = $this->getSpecification()->getRootDirectory();
     if ($to_file) {
       $path = $path.DIRECTORY_SEPARATOR.$to_file;
     }
     return $path;
   }
 
   private function renderTemplate($__template__, array $__scope__) {
     chdir($this->getPath());
     ob_start();
 
     if (Filesystem::pathExists($this->getPath($__template__))) {
       // Fool lint.
       $__evil__ = 'extract';
       $__evil__($__scope__ + $this->getDefaultScope());
       require $this->getPath($__template__);
     }
 
     return phutil_safe_html(ob_get_clean());
   }
 
   private function getDefaultScope() {
     return array(
       'skin'        => $this,
       'blog'        => $this->getBlog(),
       'uri'         => $this->getURI($this->getURIPath()),
       'home_uri'    => $this->getURI(''),
       'title'       => $this->getTitle(),
       'description' => $this->getDescription(),
       'og_type'     => $this->getOGType(),
     );
   }
 
   protected function renderHeader() {
     return $this->renderTemplate(
       'header.php',
       array());
   }
 
   protected function renderFooter() {
     return $this->renderTemplate('footer.php', array());
   }
 
   protected function render404Page() {
     return $this->renderTemplate('404.php', array());
   }
 
   protected function renderPostDetail(PhamePostView $post) {
     return $this->renderTemplate(
       'post-detail.php',
       array(
         'post'  => $post,
       ));
   }
 
   protected function renderPostList(array $posts) {
     return $this->renderTemplate(
       'post-list.php',
       array(
         'posts' => $posts,
         'older' => $this->renderOlderPageLink(),
         'newer' => $this->renderNewerPageLink(),
       ));
   }
 
 }
diff --git a/src/applications/phame/skins/PhameBlogSkin.php b/src/applications/phame/skins/PhameBlogSkin.php
index 9388e24fb4..1747b260f3 100644
--- a/src/applications/phame/skins/PhameBlogSkin.php
+++ b/src/applications/phame/skins/PhameBlogSkin.php
@@ -1,49 +1,46 @@
 <?php
 
-/**
- * @group phame
- */
 abstract class PhameBlogSkin extends PhabricatorController {
 
   private $blog;
   private $baseURI;
   private $preview;
   private $specification;
 
   public function setSpecification(PhameSkinSpecification $specification) {
     $this->specification = $specification;
     return $this;
   }
 
   public function getSpecification() {
     return $this->specification;
   }
 
   public function setPreview($preview) {
     $this->preview = $preview;
     return $this;
   }
 
   public function getPreview() {
     return $this->preview;
   }
 
   final public function setBaseURI($base_uri) {
     $this->baseURI = $base_uri;
     return $this;
   }
 
   final public function getURI($path) {
     return $this->baseURI.$path;
   }
 
   final public function setBlog(PhameBlog $blog) {
     $this->blog = $blog;
     return $this;
   }
 
   final public function getBlog() {
     return $this->blog;
   }
 
 }
diff --git a/src/applications/phame/skins/PhameSkinSpecification.php b/src/applications/phame/skins/PhameSkinSpecification.php
index 5acd9e57b2..7c1754f4b2 100644
--- a/src/applications/phame/skins/PhameSkinSpecification.php
+++ b/src/applications/phame/skins/PhameSkinSpecification.php
@@ -1,174 +1,170 @@
 <?php
 
-/**
- * @group phame
- */
 final class PhameSkinSpecification {
 
   const TYPE_ADVANCED   = 'advanced';
   const TYPE_BASIC      = 'basic';
 
   private $type;
   private $rootDirectory;
   private $skinClass;
   private $phutilLibraries = array();
   private $name;
   private $config;
 
   public static function loadAllSkinSpecifications() {
-
     static $specs;
 
     if ($specs === null) {
       $paths = PhabricatorEnv::getEnvConfig('phame.skins');
       $base  = dirname(phutil_get_library_root('phabricator'));
 
       $specs = array();
 
       foreach ($paths as $path) {
         $path = Filesystem::resolvePath($path, $base);
         foreach (Filesystem::listDirectory($path) as $skin_directory) {
           $skin_path = $path.DIRECTORY_SEPARATOR.$skin_directory;
 
           if (!is_dir($skin_path)) {
             continue;
           }
           $spec = self::loadSkinSpecification($skin_path);
           if (!$spec) {
             continue;
           }
 
           $name = trim($skin_directory, DIRECTORY_SEPARATOR);
 
           $spec->setName($name);
 
           if (isset($specs[$name])) {
             $that_dir = $specs[$name]->getRootDirectory();
             $this_dir = $spec->getRootDirectory();
             throw new Exception(
               "Two skins have the same name ('{$name}'), in '{$this_dir}' and ".
               "'{$that_dir}'. Rename one or adjust your 'phame.skins' ".
               "configuration.");
           }
 
           $specs[$name] = $spec;
         }
       }
     }
 
     return $specs;
   }
 
   public static function loadOneSkinSpecification($name) {
     $paths = PhabricatorEnv::getEnvConfig('phame.skins');
     $base  = dirname(phutil_get_library_root('phabricator'));
     foreach ($paths as $path) {
       $path = Filesystem::resolvePath($path, $base);
       $skin_path = $path.DIRECTORY_SEPARATOR.$name;
       if (is_dir($skin_path)) {
         $spec = self::loadSkinSpecification($skin_path);
         if ($spec) {
           $spec->setName($name);
           return $spec;
         }
       }
     }
     return null;
   }
 
   public static function loadSkinSpecification($path) {
 
     $config_path = $path.DIRECTORY_SEPARATOR.'skin.json';
     $config = array();
     if (Filesystem::pathExists($config_path)) {
       $config = Filesystem::readFile($config_path);
       $config = json_decode($config, true);
       if (!is_array($config)) {
         throw new Exception(
           "Skin configuration file '{$config_path}' is not a valid JSON file.");
       }
       $type = idx($config, 'type', self::TYPE_BASIC);
     } else {
       $type = self::TYPE_BASIC;
     }
 
     $spec = new PhameSkinSpecification();
     $spec->setRootDirectory($path);
     $spec->setConfig($config);
 
     switch ($type) {
       case self::TYPE_BASIC:
         $spec->setSkinClass('PhameBasicTemplateBlogSkin');
         break;
       case self::TYPE_ADVANCED:
         $spec->setSkinClass($config['class']);
         $spec->addPhutilLibrary($path.DIRECTORY_SEPARATOR.'src');
         break;
       default:
         throw new Exception('Unknown skin type!');
     }
 
     $spec->setType($type);
 
     return $spec;
   }
 
   public function setConfig(array $config) {
     $this->config = $config;
     return $this;
   }
 
   public function getConfig($key, $default = null) {
     return idx($this->config, $key, $default);
   }
 
   public function setName($name) {
     $this->name = $name;
     return $this;
   }
 
   public function getName() {
     return $this->getConfig('name', $this->name);
   }
 
   public function setRootDirectory($root_directory) {
     $this->rootDirectory = $root_directory;
     return $this;
   }
 
   public function getRootDirectory() {
     return $this->rootDirectory;
   }
 
   public function setType($type) {
     $this->type = $type;
     return $this;
   }
 
   public function getType() {
     return $this->type;
   }
 
   public function setSkinClass($skin_class) {
     $this->skinClass = $skin_class;
     return $this;
   }
 
   public function getSkinClass() {
     return $this->skinClass;
   }
 
   public function addPhutilLibrary($library) {
     $this->phutilLibraries[] = $library;
     return $this;
   }
 
   public function buildSkin(AphrontRequest $request) {
     foreach ($this->phutilLibraries as $library) {
       phutil_load_library($library);
     }
 
     return newv($this->getSkinClass(), array($request, $this));
   }
 
 }
diff --git a/src/applications/phame/storage/PhameDAO.php b/src/applications/phame/storage/PhameDAO.php
index 3e2e72fcb8..4b6fd23d3a 100644
--- a/src/applications/phame/storage/PhameDAO.php
+++ b/src/applications/phame/storage/PhameDAO.php
@@ -1,12 +1,9 @@
 <?php
 
-/**
- * @group phame
- */
 abstract class PhameDAO extends PhabricatorLiskDAO {
 
   public function getApplicationName() {
     return 'phame';
   }
 
 }
diff --git a/src/applications/phame/view/PhamePostView.php b/src/applications/phame/view/PhamePostView.php
index 5aab995a31..b816f6206a 100644
--- a/src/applications/phame/view/PhamePostView.php
+++ b/src/applications/phame/view/PhamePostView.php
@@ -1,243 +1,240 @@
 <?php
 
-/**
- * @group phame
- */
 final class PhamePostView extends AphrontView {
 
   private $post;
   private $author;
   private $body;
   private $skin;
   private $summary;
 
 
   public function setSkin(PhameBlogSkin $skin) {
     $this->skin = $skin;
     return $this;
   }
 
   public function getSkin() {
     return $this->skin;
   }
 
   public function setAuthor(PhabricatorObjectHandle $author) {
     $this->author = $author;
     return $this;
   }
 
   public function getAuthor() {
     return $this->author;
   }
 
   public function setPost(PhamePost $post) {
     $this->post = $post;
     return $this;
   }
 
   public function getPost() {
     return $this->post;
   }
 
   public function setBody($body) {
     $this->body = $body;
     return $this;
   }
 
   public function getBody() {
     return $this->body;
   }
 
   public function setSummary($summary) {
     $this->summary = $summary;
     return $this;
   }
 
   public function getSummary() {
     return $this->summary;
   }
 
   public function renderTitle() {
     $href = $this->getSkin()->getURI('post/'.$this->getPost()->getPhameTitle());
     return phutil_tag(
       'h2',
       array(
         'class' => 'phame-post-title',
       ),
       phutil_tag(
         'a',
         array(
           'href' => $href,
         ),
         $this->getPost()->getTitle()));
   }
 
   public function renderDatePublished() {
     return phutil_tag(
       'div',
       array(
         'class' => 'phame-post-date',
       ),
         pht(
           'Published on %s by %s',
           phabricator_datetime(
             $this->getPost()->getDatePublished(),
             $this->getUser()),
           $this->getAuthor()->getName()));
   }
 
   public function renderBody() {
     return phutil_tag(
       'div',
       array(
         'class' => 'phame-post-body',
       ),
       $this->getBody());
   }
 
   public function renderSummary() {
     return phutil_tag(
       'div',
       array(
         'class' => 'phame-post-body',
       ),
       $this->getSummary());
   }
 
   public function renderComments() {
     $post = $this->getPost();
 
     switch ($post->getCommentsWidget()) {
       case 'facebook':
         $comments = $this->renderFacebookComments();
         break;
       case 'disqus':
         $comments = $this->renderDisqusComments();
         break;
       case 'none':
       default:
         $comments = null;
         break;
     }
     return $comments;
   }
 
   public function render() {
     return phutil_tag(
       'div',
       array(
         'class' => 'phame-post',
       ),
       array(
         $this->renderTitle(),
         $this->renderDatePublished(),
         $this->renderBody(),
         $this->renderComments(),
       ));
   }
 
   public function renderWithSummary() {
     return phutil_tag(
       'div',
       array(
         'class' => 'phame-post',
       ),
       array(
         $this->renderTitle(),
         $this->renderDatePublished(),
         $this->renderSummary(),
       ));
   }
 
   private function renderFacebookComments() {
     $fb_id = PhabricatorAuthProviderOAuthFacebook::getFacebookApplicationID();
     if (!$fb_id) {
       return null;
     }
 
     $fb_root = phutil_tag('div',
       array(
         'id' => 'fb-root',
       ),
       '');
 
     $c_uri = '//connect.facebook.net/en_US/all.js#xfbml=1&appId='.$fb_id;
     $fb_js = CelerityStaticResourceResponse::renderInlineScript(
       jsprintf(
         '(function(d, s, id) {'.
         ' var js, fjs = d.getElementsByTagName(s)[0];'.
         ' if (d.getElementById(id)) return;'.
         ' js = d.createElement(s); js.id = id;'.
         ' js.src = %s;'.
         ' fjs.parentNode.insertBefore(js, fjs);'.
         '}(document, \'script\', \'facebook-jssdk\'));',
         $c_uri));
 
 
     $uri = $this->getSkin()->getURI('post/'.$this->getPost()->getPhameTitle());
 
     $fb_comments = phutil_tag('div',
       array(
         'class'            => 'fb-comments',
         'data-href'        => $uri,
         'data-num-posts'   => 5,
       ),
       '');
 
     return phutil_tag(
       'div',
       array(
         'class' => 'phame-comments-facebook',
       ),
       array(
         $fb_root,
         $fb_js,
         $fb_comments,
       ));
   }
 
   private function renderDisqusComments() {
     $disqus_shortname = PhabricatorEnv::getEnvConfig('disqus.shortname');
     if (!$disqus_shortname) {
       return null;
     }
 
     $post = $this->getPost();
 
     $disqus_thread = phutil_tag('div',
       array(
         'id' => 'disqus_thread'
       ));
 
     // protip - try some  var disqus_developer = 1; action to test locally
     $disqus_js = CelerityStaticResourceResponse::renderInlineScript(
       jsprintf(
         ' var disqus_shortname = %s;'.
         ' var disqus_identifier = %s;'.
         ' var disqus_url = %s;'.
         ' var disqus_title = %s;'.
         '(function() {'.
         ' var dsq = document.createElement("script");'.
         ' dsq.type = "text/javascript";'.
         ' dsq.async = true;'.
         ' dsq.src = "//" + disqus_shortname + ".disqus.com/embed.js";'.
         '(document.getElementsByTagName("head")[0] ||'.
         ' document.getElementsByTagName("body")[0]).appendChild(dsq);'.
         '})();',
         $disqus_shortname,
         $post->getPHID(),
         $this->getSkin()->getURI('post/'.$this->getPost()->getPhameTitle()),
         $post->getTitle()));
 
     return phutil_tag(
       'div',
       array(
         'class' => 'phame-comments-disqus',
       ),
       array(
         $disqus_thread,
         $disqus_js,
       ));
   }
 
 }
diff --git a/src/applications/phid/conduit/ConduitAPI_phid_Method.php b/src/applications/phid/conduit/ConduitAPI_phid_Method.php
index fc32bebf16..0d20ff7f6f 100644
--- a/src/applications/phid/conduit/ConduitAPI_phid_Method.php
+++ b/src/applications/phid/conduit/ConduitAPI_phid_Method.php
@@ -1,25 +1,22 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class ConduitAPI_phid_Method extends ConduitAPIMethod {
 
   protected function buildHandleInformationDictionary(
     PhabricatorObjectHandle $handle) {
 
     return array(
       'phid'      => $handle->getPHID(),
       'uri'       => PhabricatorEnv::getProductionURI($handle->getURI()),
 
       'typeName'  => $handle->getTypeName(),
       'type'      => $handle->getType(),
 
       'name'      => $handle->getName(),
       'fullName'  => $handle->getFullName(),
 
       'status'    => $handle->getStatus(),
     );
   }
 
 }
diff --git a/src/applications/phid/conduit/ConduitAPI_phid_info_Method.php b/src/applications/phid/conduit/ConduitAPI_phid_info_Method.php
index 01910c503f..800273d933 100644
--- a/src/applications/phid/conduit/ConduitAPI_phid_info_Method.php
+++ b/src/applications/phid/conduit/ConduitAPI_phid_info_Method.php
@@ -1,53 +1,48 @@
 <?php
 
-/**
- * @group conduit
- */
-final class ConduitAPI_phid_info_Method
-  extends ConduitAPI_phid_Method {
+final class ConduitAPI_phid_info_Method extends ConduitAPI_phid_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_DEPRECATED;
   }
 
   public function getMethodStatusDescription() {
     return "Replaced by 'phid.query'.";
   }
 
   public function getMethodDescription() {
     return 'Retrieve information about an arbitrary PHID.';
   }
 
   public function defineParamTypes() {
     return array(
       'phid' => 'required phid',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict<string, wild>';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-BAD-PHID' => 'No such object exists.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
-
     $phid = $request->getValue('phid');
 
     $handle = id(new PhabricatorHandleQuery())
       ->setViewer($request->getUser())
       ->withPHIDs(array($phid))
       ->executeOne();
 
     if (!$handle->isComplete()) {
       throw new ConduitException('ERR-BAD-PHID');
     }
 
     return $this->buildHandleInformationDictionary($handle);
   }
 
 }
diff --git a/src/applications/phid/conduit/ConduitAPI_phid_lookup_Method.php b/src/applications/phid/conduit/ConduitAPI_phid_lookup_Method.php
index 9e09fc1534..e9bc6a5e1b 100644
--- a/src/applications/phid/conduit/ConduitAPI_phid_lookup_Method.php
+++ b/src/applications/phid/conduit/ConduitAPI_phid_lookup_Method.php
@@ -1,51 +1,47 @@
 <?php
 
-/**
- * @group conduit
- */
-final class ConduitAPI_phid_lookup_Method
-  extends ConduitAPI_phid_Method {
+final class ConduitAPI_phid_lookup_Method extends ConduitAPI_phid_Method {
 
   public function getMethodDescription() {
     return 'Look up objects by name.';
   }
 
   public function defineParamTypes() {
     return array(
       'names' => 'required list<string>',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict<string, wild>';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $names = $request->getValue('names');
 
     $query = id(new PhabricatorObjectQuery())
       ->setViewer($request->getUser())
       ->withNames($names);
     $query->execute();
     $name_map = $query->getNamedResults();
 
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($request->getUser())
       ->withPHIDs(mpull($name_map, 'getPHID'))
       ->execute();
 
     $result = array();
     foreach ($name_map as $name => $object) {
       $phid = $object->getPHID();
       $handle = $handles[$phid];
       $result[$name] = $this->buildHandleInformationDictionary($handle);
     }
 
     return $result;
   }
 
 }
diff --git a/src/applications/phid/conduit/ConduitAPI_phid_query_Method.php b/src/applications/phid/conduit/ConduitAPI_phid_query_Method.php
index 4dd6e3f4ec..839140d29e 100644
--- a/src/applications/phid/conduit/ConduitAPI_phid_query_Method.php
+++ b/src/applications/phid/conduit/ConduitAPI_phid_query_Method.php
@@ -1,46 +1,41 @@
 <?php
 
-/**
- * @group conduit
- */
-final class ConduitAPI_phid_query_Method
-  extends ConduitAPI_phid_Method {
+final class ConduitAPI_phid_query_Method extends ConduitAPI_phid_Method {
 
   public function getMethodDescription() {
     return 'Retrieve information about arbitrary PHIDs.';
   }
 
   public function defineParamTypes() {
     return array(
       'phids' => 'required list<phid>',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict<string, wild>';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
-
     $phids = $request->getValue('phids');
 
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($request->getUser())
       ->withPHIDs($phids)
       ->execute();
 
     $result = array();
     foreach ($handles as $phid => $handle) {
       if ($handle->isComplete()) {
         $result[$phid] = $this->buildHandleInformationDictionary($handle);
       }
     }
 
     return $result;
   }
 
 }
diff --git a/src/applications/phid/handle/view/render.php b/src/applications/phid/handle/view/render.php
index d2197d1d6f..49d18f95fe 100644
--- a/src/applications/phid/handle/view/render.php
+++ b/src/applications/phid/handle/view/render.php
@@ -1,18 +1,17 @@
 <?php
 
 /**
  * Implodes selected handles from a pool of handles. Useful if you load handles
  * for various phids, but only render a few of them at a time.
  *
- * @group  handle
  * @return PhutilSafeHTML
  */
 function implode_selected_handle_links($glue, array $handles, array $phids) {
 
   $items = array();
   foreach ($phids as $phid) {
     $items[] = $handles[$phid]->renderLink();
   }
 
   return phutil_implode_html($glue, $items);
 }
diff --git a/src/applications/pholio/config/PhabricatorPholioConfigOptions.php b/src/applications/pholio/config/PhabricatorPholioConfigOptions.php
index 1f31095c70..67cd29d853 100644
--- a/src/applications/pholio/config/PhabricatorPholioConfigOptions.php
+++ b/src/applications/pholio/config/PhabricatorPholioConfigOptions.php
@@ -1,29 +1,26 @@
 <?php
 
-/**
- * @group pholio
- */
 final class PhabricatorPholioConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
     return pht('Pholio');
   }
 
   public function getDescription() {
     return pht('Configure Pholio.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption('metamta.pholio.reply-handler-domain', 'string', null)
         ->setDescription(
           pht(
             'Like {{metamta.maniphest.reply-handler-domain}}, but affects '.
             'Pholio.')),
       $this->newOption('metamta.pholio.subject-prefix', 'string', '[Pholio]')
         ->setDescription(pht('Subject prefix for Pholio email.'))
     );
   }
 
 }
diff --git a/src/applications/pholio/constants/PholioConstants.php b/src/applications/pholio/constants/PholioConstants.php
index 43a0639acb..d74fec2a80 100644
--- a/src/applications/pholio/constants/PholioConstants.php
+++ b/src/applications/pholio/constants/PholioConstants.php
@@ -1,8 +1,3 @@
 <?php
 
-/**
- * @group pholio
- */
-abstract class PholioConstants {
-
-}
+abstract class PholioConstants {}
diff --git a/src/applications/pholio/constants/PholioTransactionType.php b/src/applications/pholio/constants/PholioTransactionType.php
index 50ab8fe942..f42b1365b2 100644
--- a/src/applications/pholio/constants/PholioTransactionType.php
+++ b/src/applications/pholio/constants/PholioTransactionType.php
@@ -1,22 +1,20 @@
 <?php
 
-/**
- * @group pholio
- */
 final class PholioTransactionType extends PholioConstants {
 
   /* edits to the high level mock */
   const TYPE_NAME         = 'name';
   const TYPE_DESCRIPTION  = 'description';
   const TYPE_STATUS       = 'status';
 
   /* edits to images within the mock */
   const TYPE_IMAGE_FILE = 'image-file';
   const TYPE_IMAGE_NAME= 'image-name';
   const TYPE_IMAGE_DESCRIPTION = 'image-description';
   const TYPE_IMAGE_REPLACE = 'image-replace';
   const TYPE_IMAGE_SEQUENCE = 'image-sequence';
 
   /* your witty commentary at the mock : image : x,y level */
   const TYPE_INLINE  = 'inline';
+
 }
diff --git a/src/applications/pholio/controller/PholioController.php b/src/applications/pholio/controller/PholioController.php
index c7724298be..2f33a646d1 100644
--- a/src/applications/pholio/controller/PholioController.php
+++ b/src/applications/pholio/controller/PholioController.php
@@ -1,45 +1,40 @@
 <?php
 
-/**
- * @group pholio
- */
 abstract class PholioController extends PhabricatorController {
 
   public function buildSideNavView($for_app = false) {
     $user = $this->getRequest()->getUser();
 
     $nav = new AphrontSideNavFilterView();
     $nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
 
     id(new PholioMockSearchEngine())
       ->setViewer($user)
       ->addNavigationItems($nav->getMenu());
 
     if ($for_app) {
       $nav->addFilter('new/', pht('Create Mock'));
     }
 
     $nav->selectFilter(null);
 
     return $nav;
   }
 
   public function buildApplicationCrumbs() {
     $crumbs = parent::buildApplicationCrumbs();
 
     $crumbs->addAction(
       id(new PHUIListItemView())
         ->setName(pht('Create Mock'))
         ->setHref($this->getApplicationURI('new/'))
         ->setIcon('fa-plus-square'));
 
     return $crumbs;
   }
 
   public function buildApplicationMenu() {
     return $this->buildSideNavView(true)->getMenu();
   }
 
-
-
 }
diff --git a/src/applications/pholio/controller/PholioImageUploadController.php b/src/applications/pholio/controller/PholioImageUploadController.php
index f24c7adb7d..530563dc8f 100644
--- a/src/applications/pholio/controller/PholioImageUploadController.php
+++ b/src/applications/pholio/controller/PholioImageUploadController.php
@@ -1,47 +1,44 @@
 <?php
 
-/**
- * @group pholio
- */
 final class PholioImageUploadController extends PholioController {
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $phid = $request->getStr('filePHID');
     $replaces_phid = $request->getStr('replacesPHID');
     $title = $request->getStr('title');
     $description = $request->getStr('description');
 
     $file = id(new PhabricatorFileQuery())
       ->setViewer($viewer)
       ->withPHIDs(array($phid))
       ->executeOne();
     if (!$file) {
       return new Aphront404Response();
     }
 
     if (!strlen($title)) {
       $title = $file->getName();
     }
 
     $image = id(new PholioImage())
       ->attachFile($file)
       ->setName($title)
       ->setDescription($description)
       ->makeEphemeral();
 
     $view = id(new PholioUploadedImageView())
       ->setUser($viewer)
       ->setImage($image)
       ->setReplacesPHID($replaces_phid);
 
     $content = array(
       'markup' => $view,
     );
 
     return id(new AphrontAjaxResponse())->setContent($content);
   }
 
 }
diff --git a/src/applications/pholio/controller/PholioInlineThumbController.php b/src/applications/pholio/controller/PholioInlineThumbController.php
index 9fb7c9a79a..624ce3d3ea 100644
--- a/src/applications/pholio/controller/PholioInlineThumbController.php
+++ b/src/applications/pholio/controller/PholioInlineThumbController.php
@@ -1,49 +1,46 @@
 <?php
 
-/**
- * @group pholio
- */
 final class PholioInlineThumbController extends PholioController {
 
   private $imageid;
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function willProcessRequest(array $data) {
     $this->imageid = idx($data, 'imageid');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $image = id(new PholioImage())->load($this->imageid);
 
     if ($image == null) {
       return new Aphront404Response();
     }
 
     $mock = id(new PholioMockQuery())
       ->setViewer($user)
       ->withIDs(array($image->getMockID()))
       ->executeOne();
 
     if (!$mock) {
       return new Aphront404Response();
     }
 
     $file = id(new PhabricatorFileQuery())
       ->setViewer($user)
       ->witHPHIDs(array($image->getFilePHID()))
       ->executeOne();
 
     if (!$file) {
       return new Aphront404Response();
     }
 
     return id(new AphrontRedirectResponse())->setURI($file->getThumb60x45URI());
   }
 
 }
diff --git a/src/applications/pholio/controller/PholioMockCommentController.php b/src/applications/pholio/controller/PholioMockCommentController.php
index 62d717abb0..a862e89adc 100644
--- a/src/applications/pholio/controller/PholioMockCommentController.php
+++ b/src/applications/pholio/controller/PholioMockCommentController.php
@@ -1,94 +1,91 @@
 <?php
 
-/**
- * @group pholio
- */
 final class PholioMockCommentController extends PholioController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     if (!$request->isFormPost()) {
       return new Aphront400Response();
     }
 
     $mock = id(new PholioMockQuery())
       ->setViewer($user)
       ->withIDs(array($this->id))
       ->needImages(true)
       ->executeOne();
 
     if (!$mock) {
       return new Aphront404Response();
     }
 
     $is_preview = $request->isPreviewRequest();
 
     $draft = PhabricatorDraft::buildFromRequest($request);
 
     $mock_uri = '/M'.$mock->getID();
 
     $comment = $request->getStr('comment');
 
     $xactions = array();
 
     $inline_comments = id(new PholioTransactionComment())->loadAllWhere(
       'authorphid = %s AND transactionphid IS NULL AND imageid IN (%Ld)',
       $user->getPHID(),
       mpull($mock->getImages(), 'getID'));
 
     if (!$inline_comments || strlen($comment)) {
       $xactions[] = id(new PholioTransaction())
         ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
         ->attachComment(
           id(new PholioTransactionComment())
             ->setContent($comment));
     }
 
     foreach ($inline_comments as $inline_comment) {
       $xactions[] = id(new PholioTransaction())
         ->setTransactionType(PholioTransactionType::TYPE_INLINE)
         ->attachComment($inline_comment);
     }
 
     $editor = id(new PholioMockEditor())
       ->setActor($user)
       ->setContentSourceFromRequest($request)
       ->setContinueOnNoEffect($request->isContinueRequest())
       ->setIsPreview($is_preview);
 
     try {
       $xactions = $editor->applyTransactions($mock, $xactions);
     } catch (PhabricatorApplicationTransactionNoEffectException $ex) {
       return id(new PhabricatorApplicationTransactionNoEffectResponse())
         ->setCancelURI($mock_uri)
         ->setException($ex);
     }
 
     if ($draft) {
       $draft->replaceOrDelete();
     }
 
     if ($request->isAjax() && $is_preview) {
       $xaction_view = id(new PholioTransactionView())
         ->setMock($mock);
 
       return id(new PhabricatorApplicationTransactionResponse())
         ->setViewer($user)
         ->setTransactions($xactions)
         ->setTransactionView($xaction_view)
         ->setIsPreview($is_preview)
         ->setAnchorOffset($request->getStr('anchor'));
     } else {
       return id(new AphrontRedirectResponse())->setURI($mock_uri);
     }
   }
 
 }
diff --git a/src/applications/pholio/controller/PholioMockEditController.php b/src/applications/pholio/controller/PholioMockEditController.php
index 6abe80d4af..575dcb11d1 100644
--- a/src/applications/pholio/controller/PholioMockEditController.php
+++ b/src/applications/pholio/controller/PholioMockEditController.php
@@ -1,406 +1,403 @@
 <?php
 
-/**
- * @group pholio
- */
 final class PholioMockEditController extends PholioController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = idx($data, 'id');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     if ($this->id) {
       $mock = id(new PholioMockQuery())
         ->setViewer($user)
         ->needImages(true)
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_VIEW,
             PhabricatorPolicyCapability::CAN_EDIT,
           ))
         ->withIDs(array($this->id))
         ->executeOne();
 
       if (!$mock) {
         return new Aphront404Response();
       }
 
       $title = pht('Edit Mock');
 
       $is_new = false;
       $mock_images = $mock->getImages();
       $files = mpull($mock_images, 'getFile');
       $mock_images = mpull($mock_images, null, 'getFilePHID');
     } else {
       $mock = PholioMock::initializeNewMock($user);
 
       $title = pht('Create Mock');
 
       $is_new = true;
       $files = array();
       $mock_images = array();
     }
 
     if ($is_new) {
       $v_projects = array();
     } else {
       $v_projects = PhabricatorEdgeQuery::loadDestinationPHIDs(
         $mock->getPHID(),
         PhabricatorEdgeConfig::TYPE_OBJECT_HAS_PROJECT);
       $v_projects = array_reverse($v_projects);
     }
 
     $e_name = true;
     $e_images = count($mock_images) ? null : true;
     $errors = array();
     $posted_mock_images = array();
 
     $v_name = $mock->getName();
     $v_desc = $mock->getDescription();
     $v_status = $mock->getStatus();
     $v_view = $mock->getViewPolicy();
     $v_edit = $mock->getEditPolicy();
     $v_cc = PhabricatorSubscribersQuery::loadSubscribersForPHID(
       $mock->getPHID());
 
     if ($request->isFormPost()) {
       $xactions = array();
 
       $type_name = PholioTransactionType::TYPE_NAME;
       $type_desc = PholioTransactionType::TYPE_DESCRIPTION;
       $type_status = PholioTransactionType::TYPE_STATUS;
       $type_view = PhabricatorTransactions::TYPE_VIEW_POLICY;
       $type_edit = PhabricatorTransactions::TYPE_EDIT_POLICY;
       $type_cc   = PhabricatorTransactions::TYPE_SUBSCRIBERS;
 
       $v_name = $request->getStr('name');
       $v_desc = $request->getStr('description');
       $v_status = $request->getStr('status');
       $v_view = $request->getStr('can_view');
       $v_edit = $request->getStr('can_edit');
       $v_cc   = $request->getArr('cc');
       $v_projects = $request->getArr('projects');
 
       $mock_xactions = array();
       $mock_xactions[$type_name] = $v_name;
       $mock_xactions[$type_desc] = $v_desc;
       $mock_xactions[$type_status] = $v_status;
       $mock_xactions[$type_view] = $v_view;
       $mock_xactions[$type_edit] = $v_edit;
       $mock_xactions[$type_cc]   = array('=' => $v_cc);
 
       if (!strlen($request->getStr('name'))) {
         $e_name = 'Required';
         $errors[] = pht('You must give the mock a name.');
       }
 
       $file_phids = $request->getArr('file_phids');
       if ($file_phids) {
         $files = id(new PhabricatorFileQuery())
           ->setViewer($user)
           ->withPHIDs($file_phids)
           ->execute();
         $files = mpull($files, null, 'getPHID');
         $files = array_select_keys($files, $file_phids);
       } else {
         $files = array();
       }
 
       if (!$files) {
         $e_images = pht('Required');
         $errors[] = pht('You must add at least one image to the mock.');
       } else {
         $mock->setCoverPHID(head($files)->getPHID());
       }
 
       foreach ($mock_xactions as $type => $value) {
         $xactions[$type] = id(new PholioTransaction())
           ->setTransactionType($type)
           ->setNewValue($value);
       }
 
       $order = $request->getStrList('imageOrder');
       $sequence_map = array_flip($order);
       $replaces = $request->getArr('replaces');
       $replaces_map = array_flip($replaces);
 
       /**
        * Foreach file posted, check to see whether we are replacing an image,
        * adding an image, or simply updating image metadata. Create
        * transactions for these cases as appropos.
        */
       foreach ($files as $file_phid => $file) {
         $replaces_image_phid = null;
         if (isset($replaces_map[$file_phid])) {
           $old_file_phid = $replaces_map[$file_phid];
           if ($old_file_phid != $file_phid) {
             $old_image = idx($mock_images, $old_file_phid);
             if ($old_image) {
               $replaces_image_phid = $old_image->getPHID();
             }
           }
         }
 
         $existing_image = idx($mock_images, $file_phid);
 
         $title = (string)$request->getStr('title_'.$file_phid);
         $description = (string)$request->getStr('description_'.$file_phid);
         $sequence = $sequence_map[$file_phid];
 
         if ($replaces_image_phid) {
           $replace_image = id(new PholioImage())
             ->setReplacesImagePHID($replaces_image_phid)
             ->setFilePhid($file_phid)
             ->attachFile($file)
             ->setName(strlen($title) ? $title : $file->getName())
             ->setDescription($description)
             ->setSequence($sequence);
           $xactions[] = id(new PholioTransaction())
             ->setTransactionType(
               PholioTransactionType::TYPE_IMAGE_REPLACE)
             ->setNewValue($replace_image);
           $posted_mock_images[] = $replace_image;
         } else if (!$existing_image) { // this is an add
           $add_image = id(new PholioImage())
             ->setFilePhid($file_phid)
             ->attachFile($file)
             ->setName(strlen($title) ? $title : $file->getName())
             ->setDescription($description)
             ->setSequence($sequence);
           $xactions[] = id(new PholioTransaction())
             ->setTransactionType(PholioTransactionType::TYPE_IMAGE_FILE)
             ->setNewValue(
               array('+' => array($add_image)));
           $posted_mock_images[] = $add_image;
         } else {
           $xactions[] = id(new PholioTransaction())
             ->setTransactionType(PholioTransactionType::TYPE_IMAGE_NAME)
             ->setNewValue(
               array($existing_image->getPHID() => $title));
           $xactions[] = id(new PholioTransaction())
             ->setTransactionType(
               PholioTransactionType::TYPE_IMAGE_DESCRIPTION)
               ->setNewValue(
                 array($existing_image->getPHID() => $description));
           $xactions[] = id(new PholioTransaction())
             ->setTransactionType(
               PholioTransactionType::TYPE_IMAGE_SEQUENCE)
               ->setNewValue(
                 array($existing_image->getPHID() => $sequence));
 
           $posted_mock_images[] = $existing_image;
         }
       }
       foreach ($mock_images as $file_phid => $mock_image) {
         if (!isset($files[$file_phid]) && !isset($replaces[$file_phid])) {
           // this is an outright delete
           $xactions[] = id(new PholioTransaction())
             ->setTransactionType(PholioTransactionType::TYPE_IMAGE_FILE)
             ->setNewValue(
               array('-' => array($mock_image)));
         }
       }
 
       if (!$errors) {
         $proj_edge_type = PhabricatorEdgeConfig::TYPE_OBJECT_HAS_PROJECT;
         $xactions[] = id(new PholioTransaction())
           ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
           ->setMetadataValue('edge:type', $proj_edge_type)
           ->setNewValue(array('=' => array_fuse($v_projects)));
 
         $mock->openTransaction();
         $editor = id(new PholioMockEditor())
           ->setContentSourceFromRequest($request)
           ->setContinueOnNoEffect(true)
           ->setActor($user);
 
         $xactions = $editor->applyTransactions($mock, $xactions);
 
         $mock->saveTransaction();
 
         return id(new AphrontRedirectResponse())
           ->setURI('/M'.$mock->getID());
       }
     }
 
     if ($this->id) {
       $submit = id(new AphrontFormSubmitControl())
         ->addCancelButton('/M'.$this->id)
         ->setValue(pht('Save'));
     } else {
       $submit = id(new AphrontFormSubmitControl())
         ->addCancelButton($this->getApplicationURI())
         ->setValue(pht('Create'));
     }
 
     $policies = id(new PhabricatorPolicyQuery())
       ->setViewer($user)
       ->setObject($mock)
       ->execute();
 
     // NOTE: Make this show up correctly on the rendered form.
     $mock->setViewPolicy($v_view);
     $mock->setEditPolicy($v_edit);
 
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($user)
       ->withPHIDs($v_cc)
       ->execute();
 
     $image_elements = array();
     if ($posted_mock_images) {
       $display_mock_images = $posted_mock_images;
     } else {
       $display_mock_images = $mock_images;
     }
     foreach ($display_mock_images as $mock_image) {
       $image_elements[] = id(new PholioUploadedImageView())
         ->setUser($user)
         ->setImage($mock_image)
         ->setReplacesPHID($mock_image->getFilePHID());
     }
 
     $list_id = celerity_generate_unique_node_id();
     $drop_id = celerity_generate_unique_node_id();
     $order_id = celerity_generate_unique_node_id();
 
     $list_control = phutil_tag(
       'div',
       array(
         'id' => $list_id,
         'class' => 'pholio-edit-list',
       ),
       $image_elements);
 
     $drop_control = phutil_tag(
       'div',
       array(
         'id' => $drop_id,
         'class' => 'pholio-edit-drop',
       ),
       'Drag and drop images here to add them to the mock.');
 
     $order_control = phutil_tag(
       'input',
       array(
         'type' => 'hidden',
         'name' => 'imageOrder',
         'id' => $order_id,
       ));
 
     Javelin::initBehavior(
       'pholio-mock-edit',
       array(
         'listID' => $list_id,
         'dropID' => $drop_id,
         'orderID' => $order_id,
         'uploadURI' => '/file/dropupload/',
         'renderURI' => $this->getApplicationURI('image/upload/'),
         'pht' => array(
           'uploading' => pht('Uploading Image...'),
           'uploaded' => pht('Upload Complete...'),
           'undo' => pht('Undo'),
           'removed' => pht('This image will be removed from the mock.'),
         ),
       ));
 
     if ($v_projects) {
       $project_handles = $this->loadViewerHandles($v_projects);
     } else {
       $project_handles = array();
     }
 
     require_celerity_resource('pholio-edit-css');
     $form = id(new AphrontFormView())
       ->setUser($user)
       ->appendChild($order_control)
       ->appendChild(
         id(new AphrontFormTextControl())
         ->setName('name')
         ->setValue($v_name)
         ->setLabel(pht('Name'))
         ->setError($e_name))
       ->appendChild(
         id(new PhabricatorRemarkupControl())
         ->setName('description')
         ->setValue($v_desc)
         ->setLabel(pht('Description'))
         ->setUser($user));
 
     if ($this->id) {
       $form->appendChild(
         id(new AphrontFormSelectControl())
         ->setLabel(pht('Status'))
         ->setName('status')
         ->setValue($mock->getStatus())
         ->setOptions($mock->getStatuses()));
     } else {
       $form->addHiddenInput('status', 'open');
     }
 
     $form->appendChild(
         id(new AphrontFormTokenizerControl())
           ->setLabel(pht('Projects'))
           ->setName('projects')
           ->setValue($project_handles)
           ->setDatasource('/typeahead/common/projects/'))
       ->appendChild(
         id(new AphrontFormTokenizerControl())
         ->setLabel(pht('CC'))
         ->setName('cc')
         ->setValue($handles)
         ->setUser($user)
         ->setDatasource('/typeahead/common/mailable/'))
       ->appendChild(
         id(new AphrontFormPolicyControl())
         ->setUser($user)
         ->setCapability(PhabricatorPolicyCapability::CAN_VIEW)
         ->setPolicyObject($mock)
         ->setPolicies($policies)
         ->setName('can_view'))
       ->appendChild(
         id(new AphrontFormPolicyControl())
         ->setUser($user)
         ->setCapability(PhabricatorPolicyCapability::CAN_EDIT)
         ->setPolicyObject($mock)
         ->setPolicies($policies)
         ->setName('can_edit'))
       ->appendChild(
         id(new AphrontFormMarkupControl())
         ->setValue($list_control))
       ->appendChild(
         id(new AphrontFormMarkupControl())
         ->setValue($drop_control)
         ->setError($e_images))
       ->appendChild($submit);
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText($title)
       ->setFormErrors($errors)
       ->setForm($form);
 
     $crumbs = $this->buildApplicationCrumbs();
     if (!$is_new) {
       $crumbs->addTextCrumb($mock->getMonogram(), '/'.$mock->getMonogram());
     }
     $crumbs->addTextCrumb($title);
 
     $content = array(
       $crumbs,
       $form_box,
     );
 
     return $this->buildApplicationPage(
       $content,
       array(
         'title' => $title,
       ));
   }
 
 }
diff --git a/src/applications/pholio/editor/PholioMockEditor.php b/src/applications/pholio/editor/PholioMockEditor.php
index 1b269ddc2b..8a5eab81f4 100644
--- a/src/applications/pholio/editor/PholioMockEditor.php
+++ b/src/applications/pholio/editor/PholioMockEditor.php
@@ -1,489 +1,486 @@
 <?php
 
-/**
- * @group pholio
- */
 final class PholioMockEditor extends PhabricatorApplicationTransactionEditor {
 
   private $newImages = array();
   private function setNewImages(array $new_images) {
     assert_instances_of($new_images, 'PholioImage');
     $this->newImages = $new_images;
     return $this;
   }
   private function getNewImages() {
     return $this->newImages;
   }
 
   public function getTransactionTypes() {
     $types = parent::getTransactionTypes();
 
     $types[] = PhabricatorTransactions::TYPE_EDGE;
     $types[] = PhabricatorTransactions::TYPE_COMMENT;
     $types[] = PhabricatorTransactions::TYPE_VIEW_POLICY;
     $types[] = PhabricatorTransactions::TYPE_EDIT_POLICY;
 
     $types[] = PholioTransactionType::TYPE_NAME;
     $types[] = PholioTransactionType::TYPE_DESCRIPTION;
     $types[] = PholioTransactionType::TYPE_STATUS;
     $types[] = PholioTransactionType::TYPE_INLINE;
 
     $types[] = PholioTransactionType::TYPE_IMAGE_FILE;
     $types[] = PholioTransactionType::TYPE_IMAGE_NAME;
     $types[] = PholioTransactionType::TYPE_IMAGE_DESCRIPTION;
     $types[] = PholioTransactionType::TYPE_IMAGE_REPLACE;
     $types[] = PholioTransactionType::TYPE_IMAGE_SEQUENCE;
 
     return $types;
   }
 
   protected function getCustomTransactionOldValue(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case PholioTransactionType::TYPE_NAME:
         return $object->getName();
       case PholioTransactionType::TYPE_DESCRIPTION:
         return $object->getDescription();
       case PholioTransactionType::TYPE_STATUS:
         return $object->getStatus();
       case PholioTransactionType::TYPE_IMAGE_FILE:
         $images = $object->getImages();
         return mpull($images, 'getPHID');
       case PholioTransactionType::TYPE_IMAGE_NAME:
         $name = null;
         $phid = null;
         $image = $this->getImageForXaction($object, $xaction);
         if ($image) {
           $name = $image->getName();
           $phid = $image->getPHID();
         }
         return array($phid => $name);
       case PholioTransactionType::TYPE_IMAGE_DESCRIPTION:
         $description = null;
         $phid = null;
         $image = $this->getImageForXaction($object, $xaction);
         if ($image) {
           $description = $image->getDescription();
           $phid = $image->getPHID();
         }
         return array($phid => $description);
       case PholioTransactionType::TYPE_IMAGE_REPLACE:
         $raw = $xaction->getNewValue();
         return $raw->getReplacesImagePHID();
       case PholioTransactionType::TYPE_IMAGE_SEQUENCE:
         $sequence = null;
         $phid = null;
         $image = $this->getImageForXaction($object, $xaction);
         if ($image) {
           $sequence = $image->getSequence();
           $phid = $image->getPHID();
         }
         return array($phid => $sequence);
     }
   }
 
   protected function getCustomTransactionNewValue(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case PholioTransactionType::TYPE_NAME:
       case PholioTransactionType::TYPE_DESCRIPTION:
       case PholioTransactionType::TYPE_STATUS:
       case PholioTransactionType::TYPE_IMAGE_NAME:
       case PholioTransactionType::TYPE_IMAGE_DESCRIPTION:
       case PholioTransactionType::TYPE_IMAGE_SEQUENCE:
         return $xaction->getNewValue();
       case PholioTransactionType::TYPE_IMAGE_REPLACE:
         $raw = $xaction->getNewValue();
         return $raw->getPHID();
       case PholioTransactionType::TYPE_IMAGE_FILE:
         $raw_new_value = $xaction->getNewValue();
         $new_value = array();
         foreach ($raw_new_value as $key => $images) {
           $new_value[$key] = mpull($images, 'getPHID');
         }
         $xaction->setNewValue($new_value);
         return $this->getPHIDTransactionNewValue($xaction);
     }
   }
 
   protected function extractFilePHIDsFromCustomTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case PholioTransactionType::TYPE_IMAGE_FILE:
         $new = $xaction->getNewValue();
         $phids = array();
         foreach ($new as $key => $images) {
           $phids[] = mpull($images, 'getFilePHID');
         }
         return array_mergev($phids);
       case PholioTransactionType::TYPE_IMAGE_REPLACE:
         return array($xaction->getNewValue()->getFilePHID());
     }
 
     return array();
   }
 
 
   protected function transactionHasEffect(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case PholioTransactionType::TYPE_INLINE:
         return true;
     }
 
     return parent::transactionHasEffect($object, $xaction);
   }
 
   protected function shouldApplyInitialEffects(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     foreach ($xactions as $xaction) {
       switch ($xaction->getTransactionType()) {
         case PholioTransactionType::TYPE_IMAGE_FILE:
         case PholioTransactionType::TYPE_IMAGE_REPLACE:
           return true;
           break;
       }
     }
     return false;
   }
 
   protected function applyInitialEffects(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $new_images = array();
     foreach ($xactions as $xaction) {
       switch ($xaction->getTransactionType()) {
         case PholioTransactionType::TYPE_IMAGE_FILE:
           $new_value = $xaction->getNewValue();
           foreach ($new_value as $key => $txn_images) {
             if ($key != '+') {
               continue;
             }
             foreach ($txn_images as $image) {
               $image->save();
               $new_images[] = $image;
             }
           }
           break;
         case PholioTransactionType::TYPE_IMAGE_REPLACE:
           $image = $xaction->getNewValue();
           $image->save();
           $new_images[] = $image;
           break;
       }
     }
     $this->setNewImages($new_images);
   }
 
   protected function applyCustomInternalTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case PholioTransactionType::TYPE_NAME:
         $object->setName($xaction->getNewValue());
         if ($object->getOriginalName() === null) {
           $object->setOriginalName($xaction->getNewValue());
         }
         break;
       case PholioTransactionType::TYPE_DESCRIPTION:
         $object->setDescription($xaction->getNewValue());
         break;
       case PholioTransactionType::TYPE_STATUS:
         $object->setStatus($xaction->getNewValue());
         break;
       case PhabricatorTransactions::TYPE_EDGE:
         return;
     }
   }
 
   private function getImageForXaction(
     PholioMock $mock,
     PhabricatorApplicationTransaction $xaction) {
     $raw_new_value = $xaction->getNewValue();
     $image_phid = key($raw_new_value);
     $images = $mock->getImages();
     foreach ($images as $image) {
       if ($image->getPHID() == $image_phid) {
         return $image;
       }
     }
     return null;
   }
 
   protected function applyCustomExternalTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case PholioTransactionType::TYPE_IMAGE_FILE:
         $old_map = array_fuse($xaction->getOldValue());
         $new_map = array_fuse($xaction->getNewValue());
 
         $obsolete_map = array_diff_key($old_map, $new_map);
         $images = $object->getImages();
         foreach ($images as $seq => $image) {
           if (isset($obsolete_map[$image->getPHID()])) {
             $image->setIsObsolete(1);
             $image->save();
             unset($images[$seq]);
           }
         }
         $object->attachImages($images);
         break;
       case PholioTransactionType::TYPE_IMAGE_REPLACE:
         $old = $xaction->getOldValue();
         $images = $object->getImages();
         foreach ($images as $seq => $image) {
           if ($image->getPHID() == $old) {
             $image->setIsObsolete(1);
             $image->save();
             unset($images[$seq]);
           }
         }
         $object->attachImages($images);
         break;
       case PholioTransactionType::TYPE_IMAGE_NAME:
         $image = $this->getImageForXaction($object, $xaction);
         $value = (string) head($xaction->getNewValue());
         $image->setName($value);
         $image->save();
         break;
       case PholioTransactionType::TYPE_IMAGE_DESCRIPTION:
         $image = $this->getImageForXaction($object, $xaction);
         $value = (string) head($xaction->getNewValue());
         $image->setDescription($value);
         $image->save();
         break;
       case PholioTransactionType::TYPE_IMAGE_SEQUENCE:
         $image = $this->getImageForXaction($object, $xaction);
         $value = (int) head($xaction->getNewValue());
         $image->setSequence($value);
         $image->save();
         break;
       case PhabricatorTransactions::TYPE_EDGE:
         return;
     }
   }
 
   protected function applyFinalEffects(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $images = $this->getNewImages();
     foreach ($images as $image) {
       $image->setMockID($object->getID());
       $image->save();
     }
 
     return $xactions;
   }
 
   protected function mergeTransactions(
     PhabricatorApplicationTransaction $u,
     PhabricatorApplicationTransaction $v) {
 
     $type = $u->getTransactionType();
     switch ($type) {
       case PholioTransactionType::TYPE_NAME:
       case PholioTransactionType::TYPE_DESCRIPTION:
       case PholioTransactionType::TYPE_STATUS:
         return $v;
       case PholioTransactionType::TYPE_IMAGE_REPLACE:
         $u_img = $u->getNewValue();
         $v_img = $v->getNewValue();
         if ($u_img->getReplacesImagePHID() == $v_img->getReplacesImagePHID()) {
           return $v;
         }
         break;
       case PholioTransactionType::TYPE_IMAGE_FILE:
         return $this->mergePHIDOrEdgeTransactions($u, $v);
       case PholioTransactionType::TYPE_IMAGE_NAME:
       case PholioTransactionType::TYPE_IMAGE_DESCRIPTION:
       case PholioTransactionType::TYPE_IMAGE_SEQUENCE:
         $raw_new_value_u = $u->getNewValue();
         $raw_new_value_v = $v->getNewValue();
         $phid_u = key($raw_new_value_u);
         $phid_v = key($raw_new_value_v);
         if ($phid_u == $phid_v) {
           return $v;
         }
         break;
     }
 
     return parent::mergeTransactions($u, $v);
   }
 
   protected function shouldSendMail(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return true;
   }
 
   protected function buildReplyHandler(PhabricatorLiskDAO $object) {
     return id(new PholioReplyHandler())
       ->setMailReceiver($object);
   }
 
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $id = $object->getID();
     $name = $object->getName();
     $original_name = $object->getOriginalName();
 
     return id(new PhabricatorMetaMTAMail())
       ->setSubject("M{$id}: {$name}")
       ->addHeader('Thread-Topic', "M{$id}: {$original_name}");
   }
 
   protected function getMailTo(PhabricatorLiskDAO $object) {
     return array(
       $object->getAuthorPHID(),
       $this->requireActor()->getPHID(),
     );
   }
 
   protected function buildMailBody(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $body = new PhabricatorMetaMTAMailBody();
     $headers = array();
     $comments = array();
     $inline_comments = array();
 
     foreach ($xactions as $xaction) {
       if ($xaction->shouldHide()) {
         continue;
       }
       $comment = $xaction->getComment();
       switch ($xaction->getTransactionType()) {
         case PholioTransactionType::TYPE_INLINE:
           if ($comment && strlen($comment->getContent())) {
             $inline_comments[] = $comment;
           }
           break;
         case PhabricatorTransactions::TYPE_COMMENT:
           if ($comment && strlen($comment->getContent())) {
             $comments[] = $comment->getContent();
           }
         // fallthrough
         default:
           $headers[] = id(clone $xaction)
             ->setRenderingTarget('text')
             ->getTitle();
           break;
       }
     }
 
     $body->addRawSection(implode("\n", $headers));
 
     foreach ($comments as $comment) {
       $body->addRawSection($comment);
     }
 
     if ($inline_comments) {
       $body->addRawSection(pht('INLINE COMMENTS'));
       foreach ($inline_comments as $comment) {
         $text = pht(
           'Image %d: %s',
           $comment->getImageID(),
           $comment->getContent());
         $body->addRawSection($text);
       }
     }
 
     $body->addTextSection(
       pht('MOCK DETAIL'),
       PhabricatorEnv::getProductionURI('/M'.$object->getID()));
 
     return $body;
   }
 
   protected function getMailSubjectPrefix() {
     return PhabricatorEnv::getEnvConfig('metamta.pholio.subject-prefix');
   }
 
   protected function shouldPublishFeedStory(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return true;
   }
 
   protected function supportsSearch() {
     return true;
   }
 
   protected function shouldApplyHeraldRules(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return true;
   }
 
   protected function buildHeraldAdapter(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     return id(new HeraldPholioMockAdapter())
       ->setMock($object);
   }
 
   protected function didApplyHeraldRules(
     PhabricatorLiskDAO $object,
     HeraldAdapter $adapter,
     HeraldTranscript $transcript) {
 
     // TODO: Convert this to be transaction-based.
 
     $cc_phids = $adapter->getCcPHIDs();
     if ($cc_phids) {
       id(new PhabricatorSubscriptionsEditor())
         ->setObject($object)
         ->setActor($this->requireActor())
         ->subscribeImplicit($cc_phids)
         ->save();
     }
 
     return array();
   }
 
   protected function sortTransactions(array $xactions) {
     $head = array();
     $tail = array();
 
     // Move inline comments to the end, so the comments precede them.
     foreach ($xactions as $xaction) {
       $type = $xaction->getTransactionType();
       if ($type == PholioTransactionType::TYPE_INLINE) {
         $tail[] = $xaction;
       } else {
         $head[] = $xaction;
       }
     }
 
     return array_values(array_merge($head, $tail));
   }
 
   protected function shouldImplyCC(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case PholioTransactionType::TYPE_INLINE:
         return true;
     }
 
     return parent::shouldImplyCC($object, $xaction);
   }
 
 }
diff --git a/src/applications/pholio/lipsum/PhabricatorPholioMockTestDataGenerator.php b/src/applications/pholio/lipsum/PhabricatorPholioMockTestDataGenerator.php
index 655ec5d956..113bfaccb2 100644
--- a/src/applications/pholio/lipsum/PhabricatorPholioMockTestDataGenerator.php
+++ b/src/applications/pholio/lipsum/PhabricatorPholioMockTestDataGenerator.php
@@ -1,111 +1,107 @@
 <?php
 
-/**
- * @group pholio
- */
 final class PhabricatorPholioMockTestDataGenerator
   extends PhabricatorTestDataGenerator {
 
   public function generate() {
     $authorPHID = $this->loadPhabrictorUserPHID();
     $author = id(new PhabricatorUser())
           ->loadOneWhere('phid = %s', $authorPHID);
     $mock = id(new PholioMock())
       ->setAuthorPHID($authorPHID);
     $content_source = PhabricatorContentSource::newForSource(
       PhabricatorContentSource::SOURCE_UNKNOWN,
       array());
     $template = id(new PholioTransaction())
       ->setContentSource($content_source);
 
     // Accumulate Transactions
     $changes = array();
     $changes[PholioTransactionType::TYPE_NAME] =
       $this->generateTitle();
     $changes[PholioTransactionType::TYPE_DESCRIPTION] =
       $this->generateDescription();
     $changes[PhabricatorTransactions::TYPE_VIEW_POLICY] =
       PhabricatorPolicies::POLICY_PUBLIC;
     $changes[PhabricatorTransactions::TYPE_SUBSCRIBERS] =
       array('=' => $this->getCCPHIDs());
 
     // Get Files and make Images
     $filePHIDS = $this->generateImages();
     $files = id(new PhabricatorFileQuery())
       ->setViewer($author)
       ->withPHIDs($filePHIDS)
       ->execute();
     $mock->setCoverPHID(head($files)->getPHID());
     $sequence = 0;
     $images = array();
     foreach ($files as $file) {
       $image = new PholioImage();
       $image->setFilePHID($file->getPHID());
       $image->setSequence($sequence++);
       $image->attachMock($mock);
       $images[] = $image;
     }
 
     // Apply Transactions
     $transactions = array();
     foreach ($changes as $type => $value) {
       $transaction = clone $template;
       $transaction->setTransactionType($type);
       $transaction->setNewValue($value);
       $transactions[] = $transaction;
     }
     $mock->openTransaction();
     $editor = id(new PholioMockEditor())
       ->setContentSource($content_source)
       ->setContinueOnNoEffect(true)
       ->setActor($author)
       ->applyTransactions($mock, $transactions);
     foreach ($images as $image) {
       $image->setMockID($mock->getID());
       $image->save();
     }
 
     $mock->saveTransaction();
     return $mock->save();
   }
 
   public function generateTitle() {
     return id(new PhutilLipsumContextFreeGrammar())
       ->generate();
   }
 
   public function generateDescription() {
     return id(new PhutilLipsumContextFreeGrammar())
       ->generateSeveral(rand(30, 40));
   }
 
   public function getCCPHIDs() {
     $ccs = array();
     for ($i = 0; $i < rand(1, 4);$i++) {
       $ccs[] = $this->loadPhabrictorUserPHID();
     }
     return $ccs;
   }
 
   public function generateImages() {
     $images = newv('PhabricatorFile', array())
       ->loadAllWhere('mimeType = %s', 'image/jpeg');
     $rand_images = array();
     $quantity = rand(2, 10);
     $quantity = min($quantity, count($images));
     foreach (array_rand($images, $quantity) as $random) {
       $rand_images[] = $images[$random]->getPHID();
     }
     // this means you don't have any jpegs yet. we'll
     // just use a builtin image
     if (empty($rand_images)) {
       $default = PhabricatorFile::loadBuiltin(
         PhabricatorUser::getOmnipotentUser(),
         'profile.png');
       $rand_images[] = $default->getPHID();
     }
     return $rand_images;
   }
 
-
 }
diff --git a/src/applications/pholio/mail/PholioMockMailReceiver.php b/src/applications/pholio/mail/PholioMockMailReceiver.php
index 9097177ccb..1a631945ba 100644
--- a/src/applications/pholio/mail/PholioMockMailReceiver.php
+++ b/src/applications/pholio/mail/PholioMockMailReceiver.php
@@ -1,36 +1,31 @@
 <?php
 
-/**
- * @group pholio
- */
 final class PholioMockMailReceiver extends PhabricatorObjectMailReceiver {
 
   public function isEnabled() {
     $app_class = 'PhabricatorApplicationPholio';
     return PhabricatorApplication::isClassInstalled($app_class);
   }
 
   protected function getObjectPattern() {
     return 'M[1-9]\d*';
   }
 
   protected function loadObject($pattern, PhabricatorUser $viewer) {
     $id = (int)trim($pattern, 'M');
 
     return id(new PholioMockQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->executeOne();
   }
 
   protected function processReceivedObjectMail(
     PhabricatorMetaMTAReceivedMail $mail,
     PhabricatorLiskDAO $object,
     PhabricatorUser $sender) {
 
     // TODO: For now, we just drop this mail on the floor.
-
   }
 
-
 }
diff --git a/src/applications/pholio/mail/PholioReplyHandler.php b/src/applications/pholio/mail/PholioReplyHandler.php
index c3743a8ee9..08ba11e393 100644
--- a/src/applications/pholio/mail/PholioReplyHandler.php
+++ b/src/applications/pholio/mail/PholioReplyHandler.php
@@ -1,43 +1,40 @@
 <?php
 
-/**
- * @group pholio
- */
 final class PholioReplyHandler extends PhabricatorMailReplyHandler {
 
   public function validateMailReceiver($mail_receiver) {
     if (!($mail_receiver instanceof PholioMock)) {
       throw new Exception('Mail receiver is not a PholioMock!');
     }
   }
 
   public function getPrivateReplyHandlerEmailAddress(
     PhabricatorObjectHandle $handle) {
     return $this->getDefaultPrivateReplyHandlerEmailAddress($handle, 'M');
   }
 
   public function getPublicReplyHandlerEmailAddress() {
     return $this->getDefaultPublicReplyHandlerEmailAddress('M');
   }
 
   public function getReplyHandlerDomain() {
     return PhabricatorEnv::getEnvConfig(
       'metamta.pholio.reply-handler-domain');
   }
 
   public function getReplyHandlerInstructions() {
     if ($this->supportsReplies()) {
       // TODO: Implement.
       return null;
       return pht('Reply to comment.');
     } else {
       return null;
     }
   }
 
   protected function receiveEmail(PhabricatorMetaMTAReceivedMail $mail) {
     // TODO: Implement this.
     return null;
   }
 
 }
diff --git a/src/applications/pholio/query/PholioMockQuery.php b/src/applications/pholio/query/PholioMockQuery.php
index dbe8334193..6f5412e6cc 100644
--- a/src/applications/pholio/query/PholioMockQuery.php
+++ b/src/applications/pholio/query/PholioMockQuery.php
@@ -1,181 +1,178 @@
 <?php
 
-/**
- * @group pholio
- */
 final class PholioMockQuery
   extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $ids;
   private $phids;
   private $authorPHIDs;
   private $statuses;
 
   private $needCoverFiles;
   private $needImages;
   private $needInlineComments;
   private $needTokenCounts;
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
     return $this;
   }
 
   public function withPHIDs(array $phids) {
     $this->phids = $phids;
     return $this;
   }
 
   public function withAuthorPHIDs(array $author_phids) {
     $this->authorPHIDs = $author_phids;
     return $this;
   }
 
   public function withStatuses(array $statuses) {
     $this->statuses = $statuses;
     return $this;
   }
 
   public function needCoverFiles($need_cover_files) {
     $this->needCoverFiles = $need_cover_files;
     return $this;
   }
 
   public function needImages($need_images) {
     $this->needImages = $need_images;
     return $this;
   }
 
   public function needInlineComments($need_inline_comments) {
     $this->needInlineComments = $need_inline_comments;
     return $this;
   }
 
   public function needTokenCounts($need) {
     $this->needTokenCounts = $need;
     return $this;
   }
 
   protected function loadPage() {
     $table = new PholioMock();
     $conn_r = $table->establishConnection('r');
 
     $data = queryfx_all(
       $conn_r,
       'SELECT * FROM %T %Q %Q %Q',
       $table->getTableName(),
       $this->buildWhereClause($conn_r),
       $this->buildOrderClause($conn_r),
       $this->buildLimitClause($conn_r));
 
     $mocks = $table->loadAllFromArray($data);
 
     if ($mocks && $this->needImages) {
       $this->loadImages($mocks);
     }
 
     if ($mocks && $this->needCoverFiles) {
       $this->loadCoverFiles($mocks);
     }
 
     if ($mocks && $this->needTokenCounts) {
       $this->loadTokenCounts($mocks);
     }
 
     return $mocks;
   }
 
   private function buildWhereClause(AphrontDatabaseConnection $conn_r) {
     $where = array();
 
     $where[] = $this->buildPagingClause($conn_r);
 
     if ($this->ids) {
       $where[] = qsprintf(
         $conn_r,
         'id IN (%Ld)',
         $this->ids);
     }
 
     if ($this->phids) {
       $where[] = qsprintf(
         $conn_r,
         'phid IN (%Ls)',
         $this->phids);
     }
 
     if ($this->authorPHIDs) {
       $where[] = qsprintf(
         $conn_r,
         'authorPHID in (%Ls)',
         $this->authorPHIDs);
     }
 
     if ($this->statuses) {
       $where[] = qsprintf(
         $conn_r,
         'status IN (%Ls)',
         $this->statuses);
     }
 
     return $this->formatWhereClause($where);
   }
 
   private function loadImages(array $mocks) {
     assert_instances_of($mocks, 'PholioMock');
 
     $mock_map = mpull($mocks, null, 'getID');
     $all_images = id(new PholioImageQuery())
       ->setViewer($this->getViewer())
       ->setMockCache($mock_map)
       ->withMockIDs(array_keys($mock_map))
       ->needInlineComments($this->needInlineComments)
       ->execute();
 
     $image_groups = mgroup($all_images, 'getMockID');
 
     foreach ($mocks as $mock) {
       $mock_images = idx($image_groups, $mock->getID(), array());
       $mock->attachAllImages($mock_images);
       $active_images = mfilter($mock_images, 'getIsObsolete', true);
       $mock->attachImages(msort($active_images, 'getSequence'));
     }
   }
 
   private function loadCoverFiles(array $mocks) {
     assert_instances_of($mocks, 'PholioMock');
     $cover_file_phids = mpull($mocks, 'getCoverPHID');
     $cover_files = id(new PhabricatorFileQuery())
       ->setViewer($this->getViewer())
       ->withPHIDs($cover_file_phids)
       ->execute();
 
     $cover_files = mpull($cover_files, null, 'getPHID');
 
     foreach ($mocks as $mock) {
       $file = idx($cover_files, $mock->getCoverPHID());
       if (!$file) {
         $file = PhabricatorFile::loadBuiltin($this->getViewer(), 'missing.png');
       }
       $mock->attachCoverFile($file);
     }
   }
 
   private function loadTokenCounts(array $mocks) {
     assert_instances_of($mocks, 'PholioMock');
 
     $phids = mpull($mocks, 'getPHID');
     $counts = id(new PhabricatorTokenCountQuery())
       ->withObjectPHIDs($phids)
       ->execute();
 
     foreach ($mocks as $mock) {
       $mock->attachTokenCount(idx($counts, $mock->getPHID(), 0));
     }
   }
 
   public function getQueryApplicationClass() {
     return 'PhabricatorApplicationPholio';
   }
 
 }
diff --git a/src/applications/pholio/query/PholioTransactionQuery.php b/src/applications/pholio/query/PholioTransactionQuery.php
index c1e262de5a..4c6d8ba0f5 100644
--- a/src/applications/pholio/query/PholioTransactionQuery.php
+++ b/src/applications/pholio/query/PholioTransactionQuery.php
@@ -1,13 +1,10 @@
 <?php
 
-/**
- * @group pholio
- */
 final class PholioTransactionQuery
   extends PhabricatorApplicationTransactionQuery {
 
   public function getTemplateApplicationTransaction() {
     return new PholioTransaction();
   }
 
 }
diff --git a/src/applications/pholio/search/PholioSearchIndexer.php b/src/applications/pholio/search/PholioSearchIndexer.php
index f05465818d..7081743c92 100644
--- a/src/applications/pholio/search/PholioSearchIndexer.php
+++ b/src/applications/pholio/search/PholioSearchIndexer.php
@@ -1,37 +1,35 @@
 <?php
 
-/**
- * @group pholio
- */
 final class PholioSearchIndexer extends PhabricatorSearchDocumentIndexer {
 
   public function getIndexableObject() {
     return new PholioMock();
   }
 
   protected function buildAbstractDocumentByPHID($phid) {
     $mock = $this->loadDocumentByPHID($phid);
 
     $doc = $this->newDocument($phid)
       ->setDocumentTitle($mock->getName())
       ->setDocumentCreated($mock->getDateCreated())
       ->setDocumentModified($mock->getDateModified());
 
     $doc->addField(
       PhabricatorSearchField::FIELD_BODY,
       $mock->getDescription());
 
     $doc->addRelationship(
       PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
       $mock->getAuthorPHID(),
       PhabricatorPeoplePHIDTypeUser::TYPECONST,
       $mock->getDateCreated());
 
     $this->indexTransactions(
       $doc,
       new PholioTransactionQuery(),
       array($phid));
 
     return $doc;
   }
+
 }
diff --git a/src/applications/pholio/storage/PholioDAO.php b/src/applications/pholio/storage/PholioDAO.php
index e755e33173..50118ef648 100644
--- a/src/applications/pholio/storage/PholioDAO.php
+++ b/src/applications/pholio/storage/PholioDAO.php
@@ -1,12 +1,9 @@
 <?php
 
-/**
- * @group pholio
- */
 abstract class PholioDAO extends PhabricatorLiskDAO {
 
   public function getApplicationName() {
     return 'pholio';
   }
 
 }
diff --git a/src/applications/pholio/storage/PholioImage.php b/src/applications/pholio/storage/PholioImage.php
index a77aff84cc..e5baf563f5 100644
--- a/src/applications/pholio/storage/PholioImage.php
+++ b/src/applications/pholio/storage/PholioImage.php
@@ -1,111 +1,108 @@
 <?php
 
-/**
- * @group pholio
- */
 final class PholioImage extends PholioDAO
   implements
     PhabricatorMarkupInterface,
     PhabricatorPolicyInterface {
 
   const MARKUP_FIELD_DESCRIPTION  = 'markup:description';
 
   protected $mockID;
   protected $filePHID;
   protected $name = '';
   protected $description = '';
   protected $sequence;
   protected $isObsolete = 0;
   protected $replacesImagePHID = null;
 
   private $inlineComments = self::ATTACHABLE;
   private $file = self::ATTACHABLE;
   private $mock = self::ATTACHABLE;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(PholioPHIDTypeImage::TYPECONST);
   }
 
   public function attachFile(PhabricatorFile $file) {
     $this->file = $file;
     return $this;
   }
 
   public function getFile() {
     $this->assertAttached($this->file);
     return $this->file;
   }
 
   public function attachMock(PholioMock $mock) {
     $this->mock = $mock;
     return $this;
   }
 
   public function getMock() {
     $this->assertAttached($this->mock);
     return $this->mock;
   }
 
 
   public function attachInlineComments(array $inline_comments) {
     assert_instances_of($inline_comments, 'PholioTransactionComment');
     $this->inlineComments = $inline_comments;
     return $this;
   }
 
   public function getInlineComments() {
     $this->assertAttached($this->inlineComments);
     return $this->inlineComments;
   }
 
 
 /* -(  PhabricatorMarkupInterface  )----------------------------------------- */
 
 
   public function getMarkupFieldKey($field) {
     $hash = PhabricatorHash::digest($this->getMarkupText($field));
     return 'M:'.$hash;
   }
 
   public function newMarkupEngine($field) {
     return PhabricatorMarkupEngine::newMarkupEngine(array());
   }
 
   public function getMarkupText($field) {
     return $this->getDescription();
   }
 
   public function didMarkupText($field, $output, PhutilMarkupEngine $engine) {
     return $output;
   }
 
   public function shouldUseMarkupCache($field) {
     return (bool)$this->getID();
   }
 
 /* -(  PhabricatorPolicyInterface Implementation  )-------------------------- */
 
   public function getCapabilities() {
     return $this->getMock()->getCapabilities();
   }
 
   public function getPolicy($capability) {
     return $this->getMock()->getPolicy($capability);
   }
 
   // really the *mock* controls who can see an image
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return $this->getMock()->hasAutomaticCapability($capability, $viewer);
   }
 
   public function describeAutomaticCapability($capability) {
     return null;
   }
 
 }
diff --git a/src/applications/pholio/storage/PholioTransactionComment.php b/src/applications/pholio/storage/PholioTransactionComment.php
index afb1edef51..dcb3d810dc 100644
--- a/src/applications/pholio/storage/PholioTransactionComment.php
+++ b/src/applications/pholio/storage/PholioTransactionComment.php
@@ -1,36 +1,34 @@
 <?php
 
-/**
- * @group pholio
- */
 final class PholioTransactionComment
   extends PhabricatorApplicationTransactionComment {
 
   protected $imageID;
   protected $x;
   protected $y;
   protected $width;
   protected $height;
   protected $content;
 
   public function getApplicationTransactionObject() {
     return new PholioTransaction();
   }
 
   public function toDictionary() {
     return array(
       'id' => $this->getID(),
       'phid' => $this->getPHID(),
       'transactionPHID' => $this->getTransactionPHID(),
       'x' => $this->getX(),
       'y' => $this->getY(),
       'width' => $this->getWidth(),
       'height' => $this->getHeight(),
     );
   }
 
   public function shouldUseMarkupCache($field) {
     // Only cache submitted comments.
     return ($this->getTransactionPHID() != null);
   }
+
 }
diff --git a/src/applications/pholio/view/PholioMockEmbedView.php b/src/applications/pholio/view/PholioMockEmbedView.php
index 10241ad5f6..146127fad3 100644
--- a/src/applications/pholio/view/PholioMockEmbedView.php
+++ b/src/applications/pholio/view/PholioMockEmbedView.php
@@ -1,56 +1,54 @@
 <?php
 
-/**
- * @group pholio
- */
 final class PholioMockEmbedView extends AphrontView {
 
   private $mock;
   private $images = array();
 
   public function setMock(PholioMock $mock) {
     $this->mock = $mock;
     return $this;
   }
 
   public function setImages(array $images) {
     $this->images = $images;
     return $this;
   }
 
   public function render() {
     if (!$this->mock) {
       throw new Exception('Call setMock() before render()!');
     }
     $mock = $this->mock;
 
     $images_to_show = array();
     $thumbnail = null;
     if (!empty($this->images)) {
       $images_to_show = array_intersect_key(
         $this->mock->getImages(), array_flip($this->images));
       foreach ($images_to_show as $image) {
         $thumbfile = $image->getFile();
         $thumbnail = $thumbfile->getThumb280x210URI();
       }
       $header = 'M'.$mock->getID().' '.$mock->getName().
         ' (#'.$image->getID().')';
       $uri = '/M'.$this->mock->getID().'/'.$image->getID().'/';
     } else {
       $thumbnail = $mock->getCoverFile()->getThumb280x210URI();
       $header = 'M'.$mock->getID().' '.$mock->getName();
       $uri = '/M'.$this->mock->getID();
     }
 
     $item = id(new PHUIPinboardItemView())
       ->setHeader($header)
       ->setURI($uri)
       ->setImageURI($thumbnail)
       ->setImageSize(280, 210)
       ->setDisabled($mock->isClosed())
       ->addIconCount('fa-picture-o', count($mock->getImages()))
       ->addIconCount('fa-trophy', $mock->getTokenCount());
 
     return $item;
   }
+
 }
diff --git a/src/applications/pholio/view/PholioMockImagesView.php b/src/applications/pholio/view/PholioMockImagesView.php
index efd41529e2..79d1f65a58 100644
--- a/src/applications/pholio/view/PholioMockImagesView.php
+++ b/src/applications/pholio/view/PholioMockImagesView.php
@@ -1,196 +1,193 @@
 <?php
 
-/**
- * @group pholio
- */
 final class PholioMockImagesView extends AphrontView {
 
   private $mock;
   private $imageID;
   private $requestURI;
   private $commentFormID;
 
   public function setCommentFormID($comment_form_id) {
     $this->commentFormID = $comment_form_id;
     return $this;
   }
 
   public function getCommentFormID() {
     return $this->commentFormID;
   }
 
   public function setRequestURI(PhutilURI $request_uri) {
     $this->requestURI = $request_uri;
     return $this;
   }
 
   public function getRequestURI() {
     return $this->requestURI;
   }
 
   public function setImageID($image_id) {
     $this->imageID = $image_id;
     return $this;
   }
 
   public function getImageID() {
     return $this->imageID;
   }
 
   public function setMock(PholioMock $mock) {
     $this->mock = $mock;
     return $this;
   }
 
   public function render() {
     if (!$this->mock) {
       throw new Exception('Call setMock() before render()!');
     }
 
     $mock = $this->mock;
 
     require_celerity_resource('javelin-behavior-pholio-mock-view');
 
     $images = array();
     $panel_id = celerity_generate_unique_node_id();
     $viewport_id = celerity_generate_unique_node_id();
 
     $ids = mpull($mock->getImages(), 'getID');
     if ($this->imageID && isset($ids[$this->imageID])) {
       $selected_id = $this->imageID;
     } else {
       $selected_id = head_key($ids);
     }
 
     // TODO: We could maybe do a better job with tailoring this, which is the
     // image shown on the review stage.
     $nonimage_uri = celerity_get_resource_uri(
       'rsrc/image/icon/fatcow/thumbnails/default.p100.png');
 
     $engine = id(new PhabricatorMarkupEngine())
       ->setViewer($this->getUser());
     foreach ($mock->getAllImages() as $image) {
       $engine->addObject($image, 'default');
     }
     $engine->process();
     $current_set = 0;
     foreach ($mock->getAllImages() as $image) {
       $file = $image->getFile();
       $metadata = $file->getMetadata();
       $x = idx($metadata, PhabricatorFile::METADATA_IMAGE_WIDTH);
       $y = idx($metadata, PhabricatorFile::METADATA_IMAGE_HEIGHT);
 
       $is_obs = (bool)$image->getIsObsolete();
       if (!$is_obs) {
         $current_set++;
       }
 
       $history_uri = '/pholio/image/history/'.$image->getID().'/';
       $images[] = array(
         'id' => $image->getID(),
         'fullURI' => $file->getBestURI(),
         'stageURI' => ($file->isViewableImage()
           ? $file->getBestURI()
           : $nonimage_uri),
         'pageURI' => $this->getImagePageURI($image, $mock),
         'downloadURI' => $file->getDownloadURI(),
         'historyURI' => $history_uri,
         'width' => $x,
         'height' => $y,
         'title' => $image->getName(),
         'descriptionMarkup' => $engine->getOutput($image, 'default'),
         'isObsolete' => (bool)$image->getIsObsolete(),
         'isImage' => $file->isViewableImage(),
         'isViewable' => $file->isViewableInBrowser(),
       );
     }
 
     $navsequence = array();
     foreach ($mock->getImages() as $image) {
       $navsequence[] = $image->getID();
     }
 
     $full_icon = array(
       javelin_tag('span', array('aural' => true), pht('View Raw File')),
       id(new PHUIIconView())->setIconFont('fa-file-image-o'),
     );
 
     $download_icon = array(
       javelin_tag('span', array('aural' => true), pht('Download File')),
       id(new PHUIIconView())->setIconFont('fa-download'),
     );
 
     $login_uri = id(new PhutilURI('/login/'))
       ->setQueryParam('next', (string) $this->getRequestURI());
     $config = array(
       'mockID' => $mock->getID(),
       'panelID' => $panel_id,
       'viewportID' => $viewport_id,
       'commentFormID' => $this->getCommentFormID(),
       'images' => $images,
       'selectedID' => $selected_id,
       'loggedIn' => $this->getUser()->isLoggedIn(),
       'logInLink' => (string) $login_uri,
       'navsequence' => $navsequence,
       'fullIcon' => hsprintf('%s', $full_icon),
       'downloadIcon' => hsprintf('%s', $download_icon),
       'currentSetSize' => $current_set,
     );
     Javelin::initBehavior('pholio-mock-view', $config);
 
     $mockview = '';
 
     $mock_wrapper = javelin_tag(
       'div',
       array(
         'id' => $viewport_id,
         'sigil' => 'mock-viewport',
         'class' => 'pholio-mock-image-viewport'
       ),
       '');
 
     $image_header = javelin_tag(
       'div',
       array(
         'id' => 'mock-image-header',
         'class' => 'pholio-mock-image-header',
       ),
       '');
 
     $mock_wrapper = javelin_tag(
       'div',
       array(
         'id' => $panel_id,
         'sigil' => 'mock-panel touchable',
         'class' => 'pholio-mock-image-panel',
       ),
       array(
         $image_header,
         $mock_wrapper,
       ));
 
     $inline_comments_holder = javelin_tag(
       'div',
       array(
         'id' => 'mock-image-description',
         'sigil' => 'mock-image-description',
         'class' => 'mock-image-description'
       ),
       '');
 
     $mockview[] = phutil_tag(
       'div',
         array(
           'class' => 'pholio-mock-image-container',
           'id' => 'pholio-mock-image-container'
         ),
       array($mock_wrapper, $inline_comments_holder));
 
     return $mockview;
   }
 
   private function getImagePageURI(PholioImage $image, PholioMock $mock) {
     $uri = '/M'.$mock->getID().'/'.$image->getID().'/';
     return $uri;
   }
 }
diff --git a/src/applications/pholio/view/PholioTransactionView.php b/src/applications/pholio/view/PholioTransactionView.php
index 45203e63db..50d764910d 100644
--- a/src/applications/pholio/view/PholioTransactionView.php
+++ b/src/applications/pholio/view/PholioTransactionView.php
@@ -1,143 +1,140 @@
 <?php
 
-/**
- * @group pholio
- */
 final class PholioTransactionView
   extends PhabricatorApplicationTransactionView {
 
   private $mock;
 
   public function setMock($mock) {
     $this->mock = $mock;
     return $this;
   }
 
   public function getMock() {
     return $this->mock;
   }
 
   protected function shouldGroupTransactions(
     PhabricatorApplicationTransaction $u,
     PhabricatorApplicationTransaction $v) {
 
     if ($u->getAuthorPHID() != $v->getAuthorPHID()) {
       // Don't group transactions by different authors.
       return false;
     }
 
     if (($v->getDateCreated() - $u->getDateCreated()) > 60) {
       // Don't group if transactions happened more than 60s apart.
       return false;
     }
 
     switch ($u->getTransactionType()) {
       case PhabricatorTransactions::TYPE_COMMENT:
       case PholioTransactionType::TYPE_INLINE:
         break;
       default:
         return false;
     }
 
     switch ($v->getTransactionType()) {
       case PholioTransactionType::TYPE_INLINE:
         return true;
     }
 
     return parent::shouldGroupTransactions($u, $v);
   }
 
   protected function renderTransactionContent(
     PhabricatorApplicationTransaction $xaction) {
 
     $out = array();
 
     $group = $xaction->getTransactionGroup();
     if ($xaction->getTransactionType() == PholioTransactionType::TYPE_INLINE) {
       array_unshift($group, $xaction);
     } else {
       $out[] = parent::renderTransactionContent($xaction);
     }
 
     if (!$group) {
       return $out;
     }
 
     $inlines = array();
     foreach ($group as $xaction) {
       switch ($xaction->getTransactionType()) {
         case PholioTransactionType::TYPE_INLINE:
           $inlines[] = $xaction;
           break;
         default:
           throw new Exception('Unknown grouped transaction type!');
       }
     }
 
     if ($inlines) {
       $icon = id(new PHUIIconView())
         ->setIconFont('fa-comment bluegrey msr');
       $header = phutil_tag(
         'div',
         array(
           'class' => 'phabricator-transaction-subheader',
         ),
         array($icon, pht('Inline Comments')));
 
       $out[] = $header;
       foreach ($inlines as $inline) {
         if (!$inline->getComment()) {
           continue;
         }
         $out[] = $this->renderInlineContent($inline);
       }
     }
 
     return $out;
   }
 
   private function renderInlineContent(PholioTransaction $inline) {
     $comment = $inline->getComment();
     $mock = $this->getMock();
     $images = $mock->getAllImages();
     $images = mpull($images, null, 'getID');
 
     $image = idx($images, $comment->getImageID());
     if (!$image) {
       throw new Exception('No image attached!');
     }
 
     $file = $image->getFile();
     if (!$file->isViewableImage()) {
       throw new Exception('File is not viewable.');
     }
 
     $image_uri = $file->getBestURI();
 
     $thumb = id(new PHUIImageMaskView())
       ->addClass('mrl')
       ->setImage($image_uri)
       ->setDisplayHeight(100)
       ->setDisplayWidth(200)
       ->withMask(true)
       ->centerViewOnPoint(
         $comment->getX(), $comment->getY(),
         $comment->getHeight(), $comment->getWidth());
 
     $link = phutil_tag(
       'a',
       array(
         'href' => '#',
         'class' => 'pholio-transaction-inline-image-anchor',
       ),
       $thumb);
 
     $inline_comment = parent::renderTransactionContent($inline);
 
     return phutil_tag(
       'div',
       array('class' => 'pholio-transaction-inline-comment'),
       array($link, $inline_comment));
   }
 
 }
diff --git a/src/applications/pholio/view/PholioUploadedImageView.php b/src/applications/pholio/view/PholioUploadedImageView.php
index 63ba47d8fb..766264ee9b 100644
--- a/src/applications/pholio/view/PholioUploadedImageView.php
+++ b/src/applications/pholio/view/PholioUploadedImageView.php
@@ -1,119 +1,116 @@
 <?php
 
-/**
- * @group pholio
- */
 final class PholioUploadedImageView extends AphrontView {
 
   private $image;
   private $replacesPHID;
 
   public function setReplacesPHID($replaces_phid) {
     $this->replacesPHID = $replaces_phid;
     return $this;
   }
 
   public function setImage(PholioImage $image) {
     $this->image = $image;
     return $this;
   }
 
   public function render() {
     require_celerity_resource('pholio-edit-css');
 
     $image = $this->image;
     $file = $image->getFile();
     $phid = $file->getPHID();
     $replaces_phid = $this->replacesPHID;
 
     $remove = $this->renderRemoveElement();
 
     $title = id(new AphrontFormTextControl())
       ->setName('title_'.$phid)
       ->setValue($image->getName())
       ->setSigil('image-title')
       ->setLabel(pht('Title'));
 
     $description = id(new PhabricatorRemarkupControl())
       ->setName('description_'.$phid)
       ->setValue($image->getDescription())
       ->setSigil('image-description')
       ->setLabel(pht('Description'));
 
     $thumb_frame = phutil_tag(
       'div',
       array(
         'class' => 'pholio-thumb-frame',
         'style' => 'background-image: url('.$file->getThumb280x210URI().');',
       ));
 
     $handle = javelin_tag(
       'div',
       array(
         'class' => 'pholio-drag-handle',
         'sigil' => 'pholio-drag-handle',
       ));
 
     $content = hsprintf(
       '<div class="pholio-thumb-box">
         <div class="pholio-thumb-title">
           %s
           <div class="pholio-thumb-name">%s</div>
         </div>
         %s
       </div>
       <div class="pholio-image-details">
         %s
         %s
       </div>',
       $remove,
       $file->getName(),
       $thumb_frame,
       $title,
       $description);
 
     $input = phutil_tag(
       'input',
       array(
         'type' => 'hidden',
         'name' => 'file_phids[]',
         'value' => $phid,
       ));
 
     $replaces_input = phutil_tag(
       'input',
       array(
         'type' => 'hidden',
         'name' => 'replaces['.$replaces_phid.']',
         'value' => $phid,
       ));
 
     return javelin_tag(
       'div',
       array(
         'class' => 'pholio-uploaded-image',
         'sigil' => 'pholio-drop-image',
         'meta'  => array(
           'filePHID' => $file->getPHID(),
           'replacesPHID' => $replaces_phid,
         ),
       ),
       array(
         $handle,
         $content,
         $input,
         $replaces_input,
       ));
   }
 
   private function renderRemoveElement() {
     return javelin_tag(
       'a',
       array(
         'class' => 'button grey',
         'sigil' => 'pholio-drop-remove',
       ),
       'X');
   }
 
 }
diff --git a/src/applications/phragment/conduit/ConduitAPI_phragment_Method.php b/src/applications/phragment/conduit/ConduitAPI_phragment_Method.php
index 1a2e9c7c08..74b3d56a10 100644
--- a/src/applications/phragment/conduit/ConduitAPI_phragment_Method.php
+++ b/src/applications/phragment/conduit/ConduitAPI_phragment_Method.php
@@ -1,13 +1,10 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class ConduitAPI_phragment_Method extends ConduitAPIMethod {
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
       'PhabricatorApplicationPhragment');
   }
 
 }
diff --git a/src/applications/phragment/conduit/ConduitAPI_phragment_getpatch_Method.php b/src/applications/phragment/conduit/ConduitAPI_phragment_getpatch_Method.php
index b7563d6c87..c553cfe2b3 100644
--- a/src/applications/phragment/conduit/ConduitAPI_phragment_getpatch_Method.php
+++ b/src/applications/phragment/conduit/ConduitAPI_phragment_getpatch_Method.php
@@ -1,185 +1,182 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_phragment_getpatch_Method
   extends ConduitAPI_phragment_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
     return pht('Retrieve the patches to apply for a given set of files.');
   }
 
   public function defineParamTypes() {
     return array(
       'path' => 'required string',
       'state' => 'required dict<string, string>',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_BAD_FRAGMENT' => 'No such fragment exists',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $path = $request->getValue('path');
     $state = $request->getValue('state');
     // The state is an array mapping file paths to hashes.
 
     $patches = array();
 
     // We need to get all of the mappings (like phragment.getstate) first
     // so that we can detect deletions and creations of files.
     $fragment = id(new PhragmentFragmentQuery())
       ->setViewer($request->getUser())
       ->withPaths(array($path))
       ->executeOne();
     if ($fragment === null) {
       throw new ConduitException('ERR_BAD_FRAGMENT');
     }
 
     $mappings = $fragment->getFragmentMappings(
       $request->getUser(),
       $fragment->getPath());
 
     $file_phids = mpull(mpull($mappings, 'getLatestVersion'), 'getFilePHID');
     $files = id(new PhabricatorFileQuery())
       ->setViewer($request->getUser())
       ->withPHIDs($file_phids)
       ->execute();
     $files = mpull($files, null, 'getPHID');
 
     // Scan all of the files that the caller currently has and iterate
     // over that.
     foreach ($state as $path => $hash) {
       // If $mappings[$path] exists, then the user has the file and it's
       // also a fragment.
       if (array_key_exists($path, $mappings)) {
         $file_phid = $mappings[$path]->getLatestVersion()->getFilePHID();
         if ($file_phid !== null) {
           // If the file PHID is present, then we need to check the
           // hashes to see if they are the same.
           $hash_caller = strtolower($state[$path]);
           $hash_current = $files[$file_phid]->getContentHash();
           if ($hash_caller === $hash_current) {
             // The user's version is identical to our version, so
             // there is no update needed.
           } else {
             // The hash differs, and the user needs to update.
             $patches[] = array(
               'path' => $path,
               'fileOld' => null,
               'fileNew' => $files[$file_phid],
               'hashOld' => $hash_caller,
               'hashNew' => $hash_current,
               'patchURI' => null);
           }
         } else {
           // We have a record of this as a file, but there is no file
           // attached to the latest version, so we consider this to be
           // a deletion.
           $patches[] = array(
             'path' => $path,
             'fileOld' => null,
             'fileNew' => null,
             'hashOld' => $hash_caller,
             'hashNew' => PhragmentPatchUtil::EMPTY_HASH,
             'patchURI' => null);
         }
       } else {
         // If $mappings[$path] does not exist, then the user has a file,
         // and we have absolutely no record of it what-so-ever (we haven't
-        // even recorded a deletion).  Assuming most applications will store
+        // even recorded a deletion). Assuming most applications will store
         // some form of data near their own files, this is probably a data
         // file relevant for the application that is not versioned, so we
         // don't tell the client to do anything with it.
       }
     }
 
     // Check the remaining files that we know about but the caller has
     // not reported.
     foreach ($mappings as $path => $child) {
       if (array_key_exists($path, $state)) {
         // We have already evaluated this above.
       } else {
         $file_phid = $mappings[$path]->getLatestVersion()->getFilePHID();
         if ($file_phid !== null) {
           // If the file PHID is present, then this is a new file that
-          // we know about, but the caller does not.  We need to tell
+          // we know about, but the caller does not. We need to tell
           // the caller to create the file.
           $hash_current = $files[$file_phid]->getContentHash();
           $patches[] = array(
             'path' => $path,
             'fileOld' => null,
             'fileNew' => $files[$file_phid],
             'hashOld' => PhragmentPatchUtil::EMPTY_HASH,
             'hashNew' => $hash_current,
             'patchURI' => null);
         } else {
           // We have a record of deleting this file, and the caller hasn't
           // reported it, so they've probably deleted it in a previous
           // update.
         }
       }
     }
 
     // Before we can calculate patches, we need to resolve the old versions
     // of files so we can draw diffs on them.
     $hashes = array();
     foreach ($patches as $patch) {
       if ($patch['hashOld'] !== PhragmentPatchUtil::EMPTY_HASH) {
         $hashes[] = $patch['hashOld'];
       }
     }
     $old_files = array();
     if (count($hashes) !== 0) {
       $old_files = id(new PhabricatorFileQuery())
         ->setViewer($request->getUser())
         ->withContentHashes($hashes)
         ->execute();
     }
     $old_files = mpull($old_files, null, 'getContentHash');
     foreach ($patches as $key => $patch) {
       if ($patch['hashOld'] !== PhragmentPatchUtil::EMPTY_HASH) {
         if (array_key_exists($patch['hashOld'], $old_files)) {
           $patches[$key]['fileOld'] = $old_files[$patch['hashOld']];
         } else {
           // We either can't see or can't read the old file.
           $patches[$key]['hashOld'] = PhragmentPatchUtil::EMPTY_HASH;
           $patches[$key]['fileOld'] = null;
         }
       }
     }
 
     // Now run through all of the patch entries, calculate the patches
     // and return the results.
     foreach ($patches as $key => $patch) {
       $data = PhragmentPatchUtil::calculatePatch(
         $patches[$key]['fileOld'],
         $patches[$key]['fileNew']);
       unset($patches[$key]['fileOld']);
       unset($patches[$key]['fileNew']);
 
       $file = PhabricatorFile::buildFromFileDataOrHash(
         $data,
         array(
           'name' => 'patch.dmp',
           'ttl' => time() + 60 * 60 * 24,
         ));
       $patches[$key]['patchURI'] = $file->getDownloadURI();
     }
 
     return $patches;
   }
 
 }
diff --git a/src/applications/phragment/conduit/ConduitAPI_phragment_queryfragments_Method.php b/src/applications/phragment/conduit/ConduitAPI_phragment_queryfragments_Method.php
index 7d5f6cff59..96a33a7704 100644
--- a/src/applications/phragment/conduit/ConduitAPI_phragment_queryfragments_Method.php
+++ b/src/applications/phragment/conduit/ConduitAPI_phragment_queryfragments_Method.php
@@ -1,83 +1,80 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_phragment_queryfragments_Method
   extends ConduitAPI_phragment_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
     return pht('Query fragments based on their paths.');
   }
 
   public function defineParamTypes() {
     return array(
       'paths' => 'required list<string>',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_BAD_FRAGMENT' => 'No such fragment exists',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $paths = $request->getValue('paths');
 
     $fragments = id(new PhragmentFragmentQuery())
       ->setViewer($request->getUser())
       ->withPaths($paths)
       ->execute();
     $fragments = mpull($fragments, null, 'getPath');
     foreach ($paths as $path) {
       if (!array_key_exists($path, $fragments)) {
         throw new ConduitException('ERR_BAD_FRAGMENT');
       }
     }
 
     $results = array();
     foreach ($fragments as $path => $fragment) {
       $mappings = $fragment->getFragmentMappings(
         $request->getUser(),
         $fragment->getPath());
 
       $file_phids = mpull(mpull($mappings, 'getLatestVersion'), 'getFilePHID');
       $files = id(new PhabricatorFileQuery())
         ->setViewer($request->getUser())
         ->withPHIDs($file_phids)
         ->execute();
       $files = mpull($files, null, 'getPHID');
 
       $result = array();
       foreach ($mappings as $cpath => $child) {
         $file_phid = $child->getLatestVersion()->getFilePHID();
         if (!isset($files[$file_phid])) {
           // Skip any files we don't have permission to access.
           continue;
         }
 
         $file = $files[$file_phid];
         $cpath = substr($child->getPath(), strlen($fragment->getPath()) + 1);
         $result[] = array(
           'phid' => $child->getPHID(),
           'phidVersion' => $child->getLatestVersionPHID(),
           'path' => $cpath,
           'hash' => $file->getContentHash(),
           'version' => $child->getLatestVersion()->getSequence(),
           'uri' => $file->getViewURI());
       }
       $results[$path] = $result;
     }
     return $results;
   }
 
 }
diff --git a/src/applications/phragment/controller/PhragmentController.php b/src/applications/phragment/controller/PhragmentController.php
index 586c28f4ae..675a1c6722 100644
--- a/src/applications/phragment/controller/PhragmentController.php
+++ b/src/applications/phragment/controller/PhragmentController.php
@@ -1,233 +1,233 @@
 <?php
 
 abstract class PhragmentController extends PhabricatorController {
 
   protected function loadParentFragments($path) {
     $components = explode('/', $path);
 
     $combinations = array();
     $current = '';
     foreach ($components as $component) {
       $current .= '/'.$component;
       $current = trim($current, '/');
       if (trim($current) === '') {
         continue;
       }
 
       $combinations[] = $current;
     }
 
     $fragments = array();
     $results = id(new PhragmentFragmentQuery())
       ->setViewer($this->getRequest()->getUser())
       ->needLatestVersion(true)
       ->withPaths($combinations)
       ->execute();
     foreach ($combinations as $combination) {
       $found = false;
       foreach ($results as $fragment) {
         if ($fragment->getPath() === $combination) {
           $fragments[] = $fragment;
           $found = true;
           break;
         }
       }
       if (!$found) {
         return null;
       }
     }
     return $fragments;
   }
 
   protected function buildApplicationCrumbsWithPath(array $fragments) {
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb('/', '/phragment/');
     foreach ($fragments as $parent) {
       $crumbs->addTextCrumb(
         $parent->getName(),
         '/phragment/browse/'.$parent->getPath());
     }
     return $crumbs;
   }
 
   protected function createCurrentFragmentView($fragment, $is_history_view) {
     if ($fragment === null) {
       return null;
     }
 
     $viewer = $this->getRequest()->getUser();
 
     $phids = array();
     $phids[] = $fragment->getLatestVersionPHID();
 
     $snapshot_phids = array();
     $snapshots = id(new PhragmentSnapshotQuery())
       ->setViewer($viewer)
       ->withPrimaryFragmentPHIDs(array($fragment->getPHID()))
       ->execute();
     foreach ($snapshots as $snapshot) {
       $phids[] = $snapshot->getPHID();
       $snapshot_phids[] = $snapshot->getPHID();
     }
 
     $this->loadHandles($phids);
 
     $file = null;
     $file_uri = null;
     if (!$fragment->isDirectory()) {
       $file = id(new PhabricatorFileQuery())
         ->setViewer($viewer)
         ->withPHIDs(array($fragment->getLatestVersion()->getFilePHID()))
         ->executeOne();
       if ($file !== null) {
         $file_uri = $file->getDownloadURI();
       }
     }
 
     $header = id(new PHUIHeaderView())
       ->setHeader($fragment->getName())
       ->setPolicyObject($fragment)
       ->setUser($viewer);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $fragment,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $zip_uri = $this->getApplicationURI('zip/'.$fragment->getPath());
 
     $actions = id(new PhabricatorActionListView())
       ->setUser($viewer)
       ->setObject($fragment)
       ->setObjectURI($fragment->getURI());
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Download Fragment'))
         ->setHref($this->isCorrectlyConfigured() ? $file_uri : null)
         ->setDisabled($file === null || !$this->isCorrectlyConfigured())
         ->setIcon('fa-download'));
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Download Contents as ZIP'))
         ->setHref($this->isCorrectlyConfigured() ? $zip_uri : null)
         ->setDisabled(!$this->isCorrectlyConfigured())
         ->setIcon('fa-floppy-o'));
     if (!$fragment->isDirectory()) {
       $actions->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('Update Fragment'))
           ->setHref($this->getApplicationURI('update/'.$fragment->getPath()))
           ->setDisabled(!$can_edit)
           ->setWorkflow(!$can_edit)
           ->setIcon('fa-refresh'));
     } else {
       $actions->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('Convert to File'))
           ->setHref($this->getApplicationURI('update/'.$fragment->getPath()))
           ->setDisabled(!$can_edit)
           ->setWorkflow(!$can_edit)
           ->setIcon('fa-file-o'));
     }
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Set Fragment Policies'))
         ->setHref($this->getApplicationURI('policy/'.$fragment->getPath()))
         ->setDisabled(!$can_edit)
         ->setWorkflow(!$can_edit)
         ->setIcon('fa-asterisk'));
     if ($is_history_view) {
       $actions->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('View Child Fragments'))
           ->setHref($this->getApplicationURI('browse/'.$fragment->getPath()))
           ->setIcon('fa-search-plus'));
     } else {
       $actions->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('View History'))
           ->setHref($this->getApplicationURI('history/'.$fragment->getPath()))
           ->setIcon('fa-list'));
     }
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Create Snapshot'))
         ->setHref($this->getApplicationURI(
           'snapshot/create/'.$fragment->getPath()))
         ->setDisabled(!$can_edit)
         ->setWorkflow(!$can_edit)
         ->setIcon('fa-files-o'));
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Promote Snapshot to Here'))
         ->setHref($this->getApplicationURI(
           'snapshot/promote/latest/'.$fragment->getPath()))
         ->setWorkflow(true)
         ->setDisabled(!$can_edit)
         ->setIcon('fa-arrow-circle-up'));
 
     $properties = id(new PHUIPropertyListView())
       ->setUser($viewer)
       ->setObject($fragment)
       ->setActionList($actions);
 
     if (!$fragment->isDirectory()) {
       if ($fragment->isDeleted()) {
         $properties->addProperty(
           pht('Type'),
           pht('File (Deleted)'));
       } else {
         $properties->addProperty(
           pht('Type'),
           pht('File'));
       }
       $properties->addProperty(
         pht('Latest Version'),
         $this->renderHandlesForPHIDs(array($fragment->getLatestVersionPHID())));
     } else {
       $properties->addProperty(
         pht('Type'),
         pht('Directory'));
     }
 
     if (count($snapshot_phids) > 0) {
       $properties->addProperty(
         pht('Snapshots'),
         $this->renderHandlesForPHIDs($snapshot_phids));
     }
 
     return id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->addPropertyList($properties);
   }
 
   function renderConfigurationWarningIfRequired() {
     $alt = PhabricatorEnv::getEnvConfig('security.alternate-file-domain');
     if ($alt === null) {
       return id(new AphrontErrorView())
         ->setTitle(pht('security.alternate-file-domain must be configured!'))
         ->setSeverity(AphrontErrorView::SEVERITY_ERROR)
         ->appendChild(phutil_tag('p', array(), pht(
           'Because Phragment generates files (such as ZIP archives and '.
           'patches) as they are requested, it requires that you configure '.
-          'the `security.alterate-file-domain` option.  This option on it\'s '.
+          'the `security.alterate-file-domain` option. This option on it\'s '.
           'own will also provide additional security when serving files '.
           'across Phabricator.')));
     }
     return null;
   }
 
   /**
    * We use this to disable the download links if the alternate domain is
-   * not configured correctly.  Although the download links will mostly work
+   * not configured correctly. Although the download links will mostly work
    * for logged in users without an alternate domain, the behaviour is
    * reasonably non-consistent and will deny public users, even if policies
    * are configured otherwise (because the Files app does not support showing
    * the info page to viewers who are not logged in).
    */
   function isCorrectlyConfigured() {
     $alt = PhabricatorEnv::getEnvConfig('security.alternate-file-domain');
     return $alt !== null;
   }
 
 }
diff --git a/src/applications/phragment/controller/PhragmentRevertController.php b/src/applications/phragment/controller/PhragmentRevertController.php
index ccf5d3299e..9b13a79277 100644
--- a/src/applications/phragment/controller/PhragmentRevertController.php
+++ b/src/applications/phragment/controller/PhragmentRevertController.php
@@ -1,87 +1,87 @@
 <?php
 
 final class PhragmentRevertController extends PhragmentController {
 
   private $dblob;
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->dblob = $data['dblob'];
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $fragment = id(new PhragmentFragmentQuery())
       ->setViewer($viewer)
       ->withPaths(array($this->dblob))
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->executeOne();
     if ($fragment === null) {
       return new Aphront404Response();
     }
 
     $version = id(new PhragmentFragmentVersionQuery())
       ->setViewer($viewer)
       ->withFragmentPHIDs(array($fragment->getPHID()))
       ->withIDs(array($this->id))
       ->executeOne();
     if ($version === null) {
       return new Aphront404Response();
     }
 
     if ($request->isDialogFormPost()) {
       $file_phid = $version->getFilePHID();
 
       $file = null;
       if ($file_phid !== null) {
         $file = id(new PhabricatorFileQuery())
           ->setViewer($viewer)
           ->withPHIDs(array($file_phid))
           ->executeOne();
         if ($file === null) {
           throw new Exception(
             'The file associated with this version was not found.');
         }
       }
 
       if ($file === null) {
         $fragment->deleteFile($viewer);
       } else {
         $fragment->updateFromFile($viewer, $file);
       }
 
       return id(new AphrontRedirectResponse())
         ->setURI($this->getApplicationURI('/history/'.$this->dblob));
     }
 
     return $this->createDialog($fragment, $version);
   }
 
   function createDialog(
     PhragmentFragment $fragment,
     PhragmentFragmentVersion $version) {
 
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $dialog = id(new AphrontDialogView())
       ->setTitle(pht('Really revert this fragment?'))
       ->setUser($request->getUser())
       ->addSubmitButton(pht('Revert'))
       ->addCancelButton(pht('Cancel'))
       ->appendParagraph(pht(
         'Reverting this fragment to version %d will create a new version of '.
-        'the fragment.  It will not delete any version history.',
+        'the fragment. It will not delete any version history.',
         $version->getSequence(),
         $version->getSequence()));
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
 }
diff --git a/src/applications/phragment/controller/PhragmentSnapshotDeleteController.php b/src/applications/phragment/controller/PhragmentSnapshotDeleteController.php
index 4c94e5d284..d9958195b7 100644
--- a/src/applications/phragment/controller/PhragmentSnapshotDeleteController.php
+++ b/src/applications/phragment/controller/PhragmentSnapshotDeleteController.php
@@ -1,53 +1,53 @@
 <?php
 
 final class PhragmentSnapshotDeleteController extends PhragmentController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $snapshot = id(new PhragmentSnapshotQuery())
       ->setViewer($viewer)
       ->requireCapabilities(array(
         PhabricatorPolicyCapability::CAN_VIEW,
         PhabricatorPolicyCapability::CAN_EDIT))
       ->withIDs(array($this->id))
       ->executeOne();
     if ($snapshot === null) {
       return new Aphront404Response();
     }
 
     if ($request->isDialogFormPost()) {
       $fragment_uri = $snapshot->getPrimaryFragment()->getURI();
 
       $snapshot->delete();
 
       return id(new AphrontRedirectResponse())
         ->setURI($fragment_uri);
     }
 
     return $this->createDialog();
   }
 
   function createDialog() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $dialog = id(new AphrontDialogView())
       ->setTitle(pht('Really delete this snapshot?'))
       ->setUser($request->getUser())
       ->addSubmitButton(pht('Delete'))
       ->addCancelButton(pht('Cancel'))
       ->appendParagraph(pht(
-        'Deleting this snapshot is a permanent operation.  You can not '.
+        'Deleting this snapshot is a permanent operation. You can not '.
         'recover the state of the snapshot.'));
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
 }
diff --git a/src/applications/phragment/controller/PhragmentSnapshotPromoteController.php b/src/applications/phragment/controller/PhragmentSnapshotPromoteController.php
index fe08f9901c..fa0b40d8c5 100644
--- a/src/applications/phragment/controller/PhragmentSnapshotPromoteController.php
+++ b/src/applications/phragment/controller/PhragmentSnapshotPromoteController.php
@@ -1,192 +1,192 @@
 <?php
 
 final class PhragmentSnapshotPromoteController extends PhragmentController {
 
   private $dblob;
   private $id;
   private $targetSnapshot;
   private $targetFragment;
   private $snapshots;
   private $options;
 
   public function willProcessRequest(array $data) {
     $this->dblob = idx($data, 'dblob', null);
     $this->id = idx($data, 'id', null);
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     // When the user is promoting a snapshot to the latest version, the
     // identifier is a fragment path.
     if ($this->dblob !== null) {
       $this->targetFragment = id(new PhragmentFragmentQuery())
         ->setViewer($viewer)
         ->requireCapabilities(array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT))
         ->withPaths(array($this->dblob))
         ->executeOne();
       if ($this->targetFragment === null) {
         return new Aphront404Response();
       }
 
       $this->snapshots = id(new PhragmentSnapshotQuery())
         ->setViewer($viewer)
         ->withPrimaryFragmentPHIDs(array($this->targetFragment->getPHID()))
         ->execute();
     }
 
     // When the user is promoting a snapshot to another snapshot, the
     // identifier is another snapshot ID.
     if ($this->id !== null) {
       $this->targetSnapshot = id(new PhragmentSnapshotQuery())
         ->setViewer($viewer)
         ->requireCapabilities(array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT))
         ->withIDs(array($this->id))
         ->executeOne();
       if ($this->targetSnapshot === null) {
         return new Aphront404Response();
       }
 
       $this->snapshots = id(new PhragmentSnapshotQuery())
         ->setViewer($viewer)
         ->withPrimaryFragmentPHIDs(array(
           $this->targetSnapshot->getPrimaryFragmentPHID()))
         ->execute();
     }
 
     // If there's no identifier, just 404.
     if ($this->snapshots === null) {
       return new Aphront404Response();
     }
 
     // Work out what options the user has.
     $this->options = mpull(
       $this->snapshots,
       'getName',
       'getID');
     if ($this->id !== null) {
       unset($this->options[$this->id]);
     }
 
     // If there's no options, show a dialog telling the
     // user there are no snapshots to promote.
     if (count($this->options) === 0) {
       return id(new AphrontDialogResponse())->setDialog(
         id(new AphrontDialogView())
           ->setTitle(pht('No snapshots to promote'))
           ->appendParagraph(pht(
             'There are no snapshots available to promote.'))
           ->setUser($request->getUser())
           ->addCancelButton(pht('Cancel')));
     }
 
     // Handle snapshot promotion.
     if ($request->isDialogFormPost()) {
       $snapshot = id(new PhragmentSnapshotQuery())
         ->setViewer($viewer)
         ->withIDs(array($request->getStr('snapshot')))
         ->executeOne();
       if ($snapshot === null) {
         return new Aphront404Response();
       }
 
       $snapshot->openTransaction();
         // Delete all existing child entries.
         $children = id(new PhragmentSnapshotChildQuery())
           ->setViewer(PhabricatorUser::getOmnipotentUser())
           ->withSnapshotPHIDs(array($snapshot->getPHID()))
           ->execute();
         foreach ($children as $child) {
           $child->delete();
         }
 
         if ($this->id === null) {
           // The user is promoting the snapshot to the latest version.
           $children = id(new PhragmentFragmentQuery())
             ->setViewer($viewer)
             ->needLatestVersion(true)
             ->withLeadingPath($this->targetFragment->getPath().'/')
             ->execute();
 
           // Add the primary fragment.
           id(new PhragmentSnapshotChild())
             ->setSnapshotPHID($snapshot->getPHID())
             ->setFragmentPHID($this->targetFragment->getPHID())
             ->setFragmentVersionPHID(
               $this->targetFragment->getLatestVersionPHID())
             ->save();
 
           // Add all of the child fragments.
           foreach ($children as $child) {
             id(new PhragmentSnapshotChild())
               ->setSnapshotPHID($snapshot->getPHID())
               ->setFragmentPHID($child->getPHID())
               ->setFragmentVersionPHID($child->getLatestVersionPHID())
               ->save();
           }
         } else {
-          // The user is promoting the snapshot to another snapshot.  We just
+          // The user is promoting the snapshot to another snapshot. We just
           // copy the other snapshot's child entries and change the snapshot
           // PHID to make it identical.
           $children = id(new PhragmentSnapshotChildQuery())
             ->setViewer($viewer)
             ->withSnapshotPHIDs(array($this->targetSnapshot->getPHID()))
             ->execute();
           foreach ($children as $child) {
             id(new PhragmentSnapshotChild())
               ->setSnapshotPHID($snapshot->getPHID())
               ->setFragmentPHID($child->getFragmentPHID())
               ->setFragmentVersionPHID($child->getFragmentVersionPHID())
               ->save();
           }
         }
       $snapshot->saveTransaction();
 
       if ($this->id === null) {
         return id(new AphrontRedirectResponse())
           ->setURI($this->targetFragment->getURI());
       } else {
         return id(new AphrontRedirectResponse())
           ->setURI($this->targetSnapshot->getURI());
       }
     }
 
     return $this->createDialog();
   }
 
   function createDialog() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $dialog = id(new AphrontDialogView())
       ->setTitle(pht('Promote which snapshot?'))
       ->setUser($request->getUser())
       ->addSubmitButton(pht('Promote'))
       ->addCancelButton(pht('Cancel'));
 
     if ($this->id === null) {
       // The user is promoting a snapshot to the latest version.
       $dialog->appendParagraph(pht(
         'Select the snapshot you want to promote to the latest version:'));
     } else {
       // The user is promoting a snapshot to another snapshot.
       $dialog->appendParagraph(pht(
         "Select the snapshot you want to promote to '%s':",
         $this->targetSnapshot->getName()));
     }
 
     $dialog->appendChild(
       id(new AphrontFormSelectControl())
         ->setUser($viewer)
         ->setName('snapshot')
         ->setOptions($this->options));
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
 }
diff --git a/src/applications/phragment/storage/PhragmentFragment.php b/src/applications/phragment/storage/PhragmentFragment.php
index 49e49713e4..e4480b64ed 100644
--- a/src/applications/phragment/storage/PhragmentFragment.php
+++ b/src/applications/phragment/storage/PhragmentFragment.php
@@ -1,340 +1,340 @@
 <?php
 
 final class PhragmentFragment extends PhragmentDAO
   implements PhabricatorPolicyInterface {
 
   protected $path;
   protected $depth;
   protected $latestVersionPHID;
   protected $viewPolicy;
   protected $editPolicy;
 
   private $latestVersion = self::ATTACHABLE;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
       PhragmentPHIDTypeFragment::TYPECONST);
   }
 
   public function getURI() {
     return '/phragment/browse/'.$this->getPath();
   }
 
   public function getName() {
     return basename($this->path);
   }
 
   public function getFile() {
     return $this->assertAttached($this->file);
   }
 
   public function attachFile(PhabricatorFile $file) {
     return $this->file = $file;
   }
 
   public function isDirectory() {
     return $this->latestVersionPHID === null;
   }
 
   public function isDeleted() {
     return $this->getLatestVersion()->getFilePHID() === null;
   }
 
   public function getLatestVersion() {
     if ($this->latestVersionPHID === null) {
       return null;
     }
     return $this->assertAttached($this->latestVersion);
   }
 
   public function attachLatestVersion(PhragmentFragmentVersion $version) {
     return $this->latestVersion = $version;
   }
 
 
 /* -(  Updating  )  --------------------------------------------------------- */
 
 
   /**
    * Create a new fragment from a file.
    */
   public static function createFromFile(
     PhabricatorUser $viewer,
     PhabricatorFile $file = null,
     $path,
     $view_policy,
     $edit_policy) {
 
     $fragment = id(new PhragmentFragment());
     $fragment->setPath($path);
     $fragment->setDepth(count(explode('/', $path)));
     $fragment->setLatestVersionPHID(null);
     $fragment->setViewPolicy($view_policy);
     $fragment->setEditPolicy($edit_policy);
     $fragment->save();
 
     // Directory fragments have no versions associated with them, so we
     // just return the fragment at this point.
     if ($file === null) {
       return $fragment;
     }
 
     if ($file->getMimeType() === 'application/zip') {
       $fragment->updateFromZIP($viewer, $file);
     } else {
       $fragment->updateFromFile($viewer, $file);
     }
 
     return $fragment;
   }
 
 
   /**
    * Set the specified file as the next version for the fragment.
    */
   public function updateFromFile(
     PhabricatorUser $viewer,
     PhabricatorFile $file) {
 
     $existing = id(new PhragmentFragmentVersionQuery())
       ->setViewer($viewer)
       ->withFragmentPHIDs(array($this->getPHID()))
       ->execute();
     $sequence = count($existing);
 
     $this->openTransaction();
       $version = id(new PhragmentFragmentVersion());
       $version->setSequence($sequence);
       $version->setFragmentPHID($this->getPHID());
       $version->setFilePHID($file->getPHID());
       $version->save();
 
       $this->setLatestVersionPHID($version->getPHID());
       $this->save();
     $this->saveTransaction();
 
     $file->attachToObject($viewer, $version->getPHID());
   }
 
   /**
    * Apply the specified ZIP archive onto the fragment, removing
    * and creating fragments as needed.
    */
   public function updateFromZIP(
     PhabricatorUser $viewer,
     PhabricatorFile $file) {
 
     if ($file->getMimeType() !== 'application/zip') {
       throw new Exception("File must have mimetype 'application/zip'");
     }
 
     // First apply the ZIP as normal.
     $this->updateFromFile($viewer, $file);
 
     // Ensure we have ZIP support.
     $zip = null;
     try {
       $zip = new ZipArchive();
     } catch (Exception $e) {
       // The server doesn't have php5-zip, so we can't do recursive updates.
       return;
     }
 
     $temp = new TempFile();
     Filesystem::writeFile($temp, $file->loadFileData());
     if (!$zip->open($temp)) {
       throw new Exception('Unable to open ZIP');
     }
 
     // Get all of the paths and their data from the ZIP.
     $mappings = array();
     for ($i = 0; $i < $zip->numFiles; $i++) {
       $path = trim($zip->getNameIndex($i), '/');
       $stream = $zip->getStream($path);
       $data = null;
-      // If the stream is false, then it is a directory entry.  We leave
+      // If the stream is false, then it is a directory entry. We leave
       // $data set to null for directories so we know not to create a
       // version entry for them.
       if ($stream !== false) {
         $data = stream_get_contents($stream);
         fclose($stream);
       }
       $mappings[$path] = $data;
     }
 
     // We need to detect any directories that are in the ZIP folder that
-    // aren't explicitly noted in the ZIP.  This can happen if the file
+    // aren't explicitly noted in the ZIP. This can happen if the file
     // entries in the ZIP look like:
     //
     //  * something/blah.png
     //  * something/other.png
     //  * test.png
     //
     // Where there is no explicit "something/" entry.
     foreach ($mappings as $path_key => $data) {
       if ($data === null) {
         continue;
       }
       $directory = dirname($path_key);
       while ($directory !== '.') {
         if (!array_key_exists($directory, $mappings)) {
           $mappings[$directory] = null;
         }
         if (dirname($directory) === $directory) {
           // dirname() will not reduce this directory any further; to
           // prevent infinite loop we just break out here.
           break;
         }
         $directory = dirname($directory);
       }
     }
 
     // Adjust the paths relative to this fragment so we can look existing
     // fragments up in the DB.
     $base_path = $this->getPath();
     $paths = array();
     foreach ($mappings as $p => $data) {
       $paths[] = $base_path.'/'.$p;
     }
 
     // FIXME: What happens when a child exists, but the current user
-    // can't see it.  We're going to create a new child with the exact
+    // can't see it. We're going to create a new child with the exact
     // same path and then bad things will happen.
     $children = id(new PhragmentFragmentQuery())
       ->setViewer($viewer)
       ->needLatestVersion(true)
       ->withLeadingPath($this->getPath().'/')
       ->execute();
     $children = mpull($children, null, 'getPath');
 
     // Iterate over the existing fragments.
     foreach ($children as $full_path => $child) {
       $path = substr($full_path, strlen($base_path) + 1);
       if (array_key_exists($path, $mappings)) {
         if ($child->isDirectory() && $mappings[$path] === null) {
           // Don't create a version entry for a directory
           // (unless it's been converted into a file).
           continue;
         }
 
         // The file is being updated.
         $file = PhabricatorFile::newFromFileData(
           $mappings[$path],
           array('name' => basename($path)));
         $child->updateFromFile($viewer, $file);
       } else {
         // The file is being deleted.
         $child->deleteFile($viewer);
       }
     }
 
     // Iterate over the mappings to find new files.
     foreach ($mappings as $path => $data) {
       if (!array_key_exists($base_path.'/'.$path, $children)) {
-        // The file is being created.  If the data is null,
+        // The file is being created. If the data is null,
         // then this is explicitly a directory being created.
         $file = null;
         if ($mappings[$path] !== null) {
           $file = PhabricatorFile::newFromFileData(
             $mappings[$path],
             array('name' => basename($path)));
         }
         PhragmentFragment::createFromFile(
           $viewer,
           $file,
           $base_path.'/'.$path,
           $this->getViewPolicy(),
           $this->getEditPolicy());
       }
     }
   }
 
   /**
    * Delete the contents of the specified fragment.
    */
   public function deleteFile(PhabricatorUser $viewer) {
     $existing = id(new PhragmentFragmentVersionQuery())
       ->setViewer($viewer)
       ->withFragmentPHIDs(array($this->getPHID()))
       ->execute();
     $sequence = count($existing);
 
     $this->openTransaction();
       $version = id(new PhragmentFragmentVersion());
       $version->setSequence($sequence);
       $version->setFragmentPHID($this->getPHID());
       $version->setFilePHID(null);
       $version->save();
 
       $this->setLatestVersionPHID($version->getPHID());
       $this->save();
     $this->saveTransaction();
   }
 
 
 /* -(  Utility  )  ---------------------------------------------------------- */
 
 
   public function getFragmentMappings(
     PhabricatorUser $viewer,
     $base_path) {
 
     $children = id(new PhragmentFragmentQuery())
       ->setViewer($viewer)
       ->needLatestVersion(true)
       ->withLeadingPath($this->getPath().'/')
       ->withDepths(array($this->getDepth() + 1))
       ->execute();
 
     if (count($children) === 0) {
       $path = substr($this->getPath(), strlen($base_path) + 1);
       return array($path => $this);
     } else {
       $mappings = array();
       foreach ($children as $child) {
         $child_mappings = $child->getFragmentMappings(
           $viewer,
           $base_path);
         foreach ($child_mappings as $key => $value) {
           $mappings[$key] = $value;
         }
       }
       return $mappings;
     }
   }
 
 
 /* -(  Policy Interface  )--------------------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
     );
   }
 
   public function getPolicy($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         return $this->getViewPolicy();
       case PhabricatorPolicyCapability::CAN_EDIT:
         return $this->getEditPolicy();
     }
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return false;
   }
 
   public function describeAutomaticCapability($capability) {
     return null;
   }
 
 }
diff --git a/src/applications/phrequent/storage/PhrequentDAO.php b/src/applications/phrequent/storage/PhrequentDAO.php
index 65680cfd2f..ec5783b7fe 100644
--- a/src/applications/phrequent/storage/PhrequentDAO.php
+++ b/src/applications/phrequent/storage/PhrequentDAO.php
@@ -1,12 +1,9 @@
 <?php
 
-/**
- * @group phrequent
- */
 abstract class PhrequentDAO extends PhabricatorLiskDAO {
 
   public function getApplicationName() {
     return 'phrequent';
   }
 
 }
diff --git a/src/applications/phriction/conduit/ConduitAPI_phriction_Method.php b/src/applications/phriction/conduit/ConduitAPI_phriction_Method.php
index 9d55b64a06..b6fb2bdad6 100644
--- a/src/applications/phriction/conduit/ConduitAPI_phriction_Method.php
+++ b/src/applications/phriction/conduit/ConduitAPI_phriction_Method.php
@@ -1,41 +1,38 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class ConduitAPI_phriction_Method extends ConduitAPIMethod {
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
       'PhabricatorApplicationPhriction');
   }
 
   final protected function buildDocumentInfoDictionary(PhrictionDocument $doc) {
     $content = $doc->getContent();
     return $this->buildDocumentContentDictionary($doc, $content);
   }
 
   final protected function buildDocumentContentDictionary(
     PhrictionDocument $doc,
     PhrictionContent $content) {
 
     $uri = PhrictionDocument::getSlugURI($content->getSlug());
     $uri = PhabricatorEnv::getProductionURI($uri);
 
     $doc_status = $doc->getStatus();
 
     return array(
       'phid'        => $doc->getPHID(),
       'uri'         => $uri,
       'slug'        => $content->getSlug(),
       'version'     => $content->getVersion(),
       'authorPHID'  => $content->getAuthorPHID(),
       'title'       => $content->getTitle(),
       'content'     => $content->getContent(),
       'status'      => PhrictionDocumentStatus::getConduitConstant($doc_status),
       'description' => $content->getDescription(),
       'dateCreated' => $content->getDateCreated(),
     );
   }
 
 }
diff --git a/src/applications/phriction/constants/PhrictionActionConstants.php b/src/applications/phriction/constants/PhrictionActionConstants.php
index adfd00d7f0..842962ca99 100644
--- a/src/applications/phriction/constants/PhrictionActionConstants.php
+++ b/src/applications/phriction/constants/PhrictionActionConstants.php
@@ -1,26 +1,23 @@
 <?php
 
-/**
- * @group phriction
- */
 final class PhrictionActionConstants extends PhrictionConstants {
 
   const ACTION_CREATE   = 'create';
   const ACTION_EDIT     = 'edit';
   const ACTION_DELETE   = 'delete';
   const ACTION_MOVE_AWAY = 'move to';
   const ACTION_MOVE_HERE = 'move here';
 
   public static function getActionPastTenseVerb($action) {
     static $map = array(
       self::ACTION_CREATE   => 'created',
       self::ACTION_EDIT     => 'edited',
       self::ACTION_DELETE   => 'deleted',
       self::ACTION_MOVE_AWAY => 'moved',
       self::ACTION_MOVE_HERE => 'moved',
     );
 
     return idx($map, $action, "brazenly {$action}'d");
   }
 
 }
diff --git a/src/applications/phriction/constants/PhrictionChangeType.php b/src/applications/phriction/constants/PhrictionChangeType.php
index aa7399910b..127c3e049f 100644
--- a/src/applications/phriction/constants/PhrictionChangeType.php
+++ b/src/applications/phriction/constants/PhrictionChangeType.php
@@ -1,26 +1,23 @@
 <?php
 
-/**
- * @group phriction
- */
 final class PhrictionChangeType extends PhrictionConstants {
 
   const CHANGE_EDIT       = 0;
   const CHANGE_DELETE     = 1;
   const CHANGE_MOVE_HERE  = 2;
   const CHANGE_MOVE_AWAY  = 3;
   const CHANGE_STUB       = 4;
 
   public static function getChangeTypeLabel($const) {
     static $map = array(
       self::CHANGE_EDIT       => 'Edit',
       self::CHANGE_DELETE     => 'Delete',
       self::CHANGE_MOVE_HERE  => 'Move Here',
       self::CHANGE_MOVE_AWAY  => 'Move Away',
       self::CHANGE_STUB       => 'Created through child',
     );
 
     return idx($map, $const, '???');
   }
 
 }
diff --git a/src/applications/phriction/constants/PhrictionConstants.php b/src/applications/phriction/constants/PhrictionConstants.php
index 445c453d30..01ea5d8ec9 100644
--- a/src/applications/phriction/constants/PhrictionConstants.php
+++ b/src/applications/phriction/constants/PhrictionConstants.php
@@ -1,8 +1,3 @@
 <?php
 
-/**
- * @group phriction
- */
-abstract class PhrictionConstants {
-
-}
+abstract class PhrictionConstants {}
diff --git a/src/applications/phriction/constants/PhrictionDocumentStatus.php b/src/applications/phriction/constants/PhrictionDocumentStatus.php
index c92f237429..11e75ec8a3 100644
--- a/src/applications/phriction/constants/PhrictionDocumentStatus.php
+++ b/src/applications/phriction/constants/PhrictionDocumentStatus.php
@@ -1,24 +1,21 @@
 <?php
 
-/**
- * @group phriction
- */
 final class PhrictionDocumentStatus extends PhrictionConstants {
 
   const STATUS_EXISTS     = 0;
   const STATUS_DELETED    = 1;
   const STATUS_MOVED      = 2;
   const STATUS_STUB       = 3;
 
   public static function getConduitConstant($const) {
     static $map = array(
       self::STATUS_EXISTS    => 'exists',
       self::STATUS_DELETED   => 'deleted',
       self::STATUS_MOVED     => 'moved',
       self::STATUS_STUB      => 'stubbed',
     );
 
     return idx($map, $const, 'unknown');
   }
 
 }
diff --git a/src/applications/phriction/controller/PhrictionController.php b/src/applications/phriction/controller/PhrictionController.php
index 2c4ab17594..69a76778d2 100644
--- a/src/applications/phriction/controller/PhrictionController.php
+++ b/src/applications/phriction/controller/PhrictionController.php
@@ -1,97 +1,94 @@
 <?php
 
-/**
- * @group phriction
- */
 abstract class PhrictionController extends PhabricatorController {
 
   public function buildSideNavView($for_app = false) {
     $user = $this->getRequest()->getUser();
 
     $nav = new AphrontSideNavFilterView();
     $nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
 
     if ($for_app) {
       $nav->addFilter('create', pht('New Document'));
       $nav->addFilter('/phriction/', pht('Index'));
     }
 
     id(new PhrictionSearchEngine())
       ->setViewer($user)
       ->addNavigationItems($nav->getMenu());
 
     $nav->selectFilter(null);
 
     return $nav;
   }
 
   public function buildApplicationMenu() {
     return $this->buildSideNavView(true)->getMenu();
   }
 
   public function buildApplicationCrumbs() {
     $crumbs = parent::buildApplicationCrumbs();
 
     if (get_class($this) != 'PhrictionListController') {
       $crumbs->addAction(
         id(new PHUIListItemView())
           ->setName(pht('Index'))
           ->setHref('/phriction/')
           ->setIcon('fa-home'));
     }
 
     $crumbs->addAction(
       id(new PHUIListItemView())
         ->setName(pht('New Document'))
         ->setHref('/phriction/new/?slug='.$this->getDocumentSlug())
         ->setWorkflow(true)
         ->setIcon('fa-plus-square'));
 
     return $crumbs;
   }
 
   public function renderBreadcrumbs($slug) {
     $ancestor_handles = array();
     $ancestral_slugs = PhabricatorSlug::getAncestry($slug);
     $ancestral_slugs[] = $slug;
     if ($ancestral_slugs) {
       $empty_slugs = array_fill_keys($ancestral_slugs, null);
       $ancestors = id(new PhrictionDocumentQuery())
         ->setViewer($this->getRequest()->getUser())
         ->withSlugs($ancestral_slugs)
         ->execute();
       $ancestors = mpull($ancestors, null, 'getSlug');
 
       $ancestor_phids = mpull($ancestors, 'getPHID');
       $handles = array();
       if ($ancestor_phids) {
         $handles = $this->loadViewerHandles($ancestor_phids);
       }
 
       $ancestor_handles = array();
       foreach ($ancestral_slugs as $slug) {
         if (isset($ancestors[$slug])) {
           $ancestor_handles[] = $handles[$ancestors[$slug]->getPHID()];
         } else {
           $handle = new PhabricatorObjectHandle();
           $handle->setName(PhabricatorSlug::getDefaultTitle($slug));
           $handle->setURI(PhrictionDocument::getSlugURI($slug));
           $ancestor_handles[] = $handle;
         }
       }
     }
 
     $breadcrumbs = array();
     foreach ($ancestor_handles as $ancestor_handle) {
       $breadcrumbs[] = id(new PhabricatorCrumbView())
         ->setName($ancestor_handle->getName())
         ->setHref($ancestor_handle->getUri());
     }
     return $breadcrumbs;
   }
 
   protected function getDocumentSlug() {
     return '';
   }
 
 }
diff --git a/src/applications/phriction/controller/PhrictionDiffController.php b/src/applications/phriction/controller/PhrictionDiffController.php
index 2f59f40290..fc2f2a6f33 100644
--- a/src/applications/phriction/controller/PhrictionDiffController.php
+++ b/src/applications/phriction/controller/PhrictionDiffController.php
@@ -1,293 +1,289 @@
 <?php
 
-/**
- * @group phriction
- */
-final class PhrictionDiffController
-  extends PhrictionController {
+final class PhrictionDiffController extends PhrictionController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $document = id(new PhrictionDocumentQuery())
       ->setViewer($user)
       ->withIDs(array($this->id))
       ->needContent(true)
       ->executeOne();
     if (!$document) {
       return new Aphront404Response();
     }
 
     $current = $document->getContent();
 
     $l = $request->getInt('l');
     $r = $request->getInt('r');
 
     $ref = $request->getStr('ref');
     if ($ref) {
       list($l, $r) = explode(',', $ref);
     }
 
     $content = id(new PhrictionContent())->loadAllWhere(
       'documentID = %d AND version IN (%Ld)',
       $document->getID(),
       array($l, $r));
     $content = mpull($content, null, 'getVersion');
 
     $content_l = idx($content, $l, null);
     $content_r = idx($content, $r, null);
 
     if (!$content_l || !$content_r) {
       return new Aphront404Response();
     }
 
     $text_l = $content_l->getContent();
     $text_r = $content_r->getContent();
 
     $text_l = phutil_utf8_hard_wrap($text_l, 80);
     $text_l = implode("\n", $text_l);
     $text_r = phutil_utf8_hard_wrap($text_r, 80);
     $text_r = implode("\n", $text_r);
 
     $engine = new PhabricatorDifferenceEngine();
     $changeset = $engine->generateChangesetFromFileContent($text_l, $text_r);
 
     $changeset->setOldProperties(
       array(
         'Title'   => $content_l->getTitle(),
       ));
     $changeset->setNewProperties(
       array(
         'Title'   => $content_r->getTitle(),
       ));
 
     $whitespace_mode = DifferentialChangesetParser::WHITESPACE_SHOW_ALL;
 
     $parser = new DifferentialChangesetParser();
     $parser->setChangeset($changeset);
     $parser->setRenderingReference("{$l},{$r}");
     $parser->setWhitespaceMode($whitespace_mode);
 
     $engine = new PhabricatorMarkupEngine();
     $engine->setViewer($user);
     $engine->process();
     $parser->setMarkupEngine($engine);
 
     $spec = $request->getStr('range');
     list($range_s, $range_e, $mask) =
       DifferentialChangesetParser::parseRangeSpecification($spec);
     $output = $parser->render($range_s, $range_e, $mask);
 
     if ($request->isAjax()) {
       return id(new PhabricatorChangesetResponse())
         ->setRenderedChangeset($output);
     }
 
     require_celerity_resource('differential-changeset-view-css');
     require_celerity_resource('syntax-highlighting-css');
     require_celerity_resource('phriction-document-css');
 
     Javelin::initBehavior('differential-show-more', array(
       'uri'         => '/phriction/diff/'.$document->getID().'/',
       'whitespace'  => $whitespace_mode,
     ));
 
     $slug = $document->getSlug();
 
     $revert_l = $this->renderRevertButton($content_l, $current);
     $revert_r = $this->renderRevertButton($content_r, $current);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumb_views = $this->renderBreadcrumbs($slug);
     foreach ($crumb_views as $view) {
       $crumbs->addCrumb($view);
     }
 
     $crumbs->addTextCrumb(
       pht('History'),
       PhrictionDocument::getSlugURI($slug, 'history'));
 
     $title = pht('Version %s vs %s', $l, $r);
 
     $header = id(new PHUIHeaderView())
       ->setHeader($title);
 
     $crumbs->addTextCrumb($title, $request->getRequestURI());
 
 
     $comparison_table = $this->renderComparisonTable(
       array(
         $content_r,
         $content_l,
       ));
 
     $navigation_table = null;
     if ($l + 1 == $r) {
       $nav_l = ($l > 1);
       $nav_r = ($r != $current->getVersion());
 
       $uri = $request->getRequestURI();
 
       if ($nav_l) {
         $link_l = phutil_tag(
           'a',
           array(
             'href' => $uri->alter('l', $l - 1)->alter('r', $r - 1),
             'class' => 'button',
           ),
           pht("\xC2\xAB Previous Change"));
       } else {
         $link_l = phutil_tag(
           'a',
           array(
             'href' => '#',
             'class' => 'button grey disabled',
           ),
           pht('Original Change'));
       }
 
       $link_r = null;
       if ($nav_r) {
         $link_r = phutil_tag(
           'a',
           array(
             'href' => $uri->alter('l', $l + 1)->alter('r', $r + 1),
             'class' => 'button',
           ),
           pht("Next Change \xC2\xBB"));
       } else {
         $link_r = phutil_tag(
           'a',
           array(
             'href' => '#',
             'class' => 'button grey disabled',
           ),
           pht('Most Recent Change'));
       }
 
       $navigation_table = phutil_tag(
         'table',
         array('class' => 'phriction-history-nav-table'),
         phutil_tag('tr', array(), array(
           phutil_tag('td', array('class' => 'nav-prev'), $link_l),
           phutil_tag('td', array('class' => 'nav-next'), $link_r),
         )));
     }
 
 
     $output = hsprintf(
       '<div class="phriction-document-history-diff">'.
         '%s%s'.
         '<table class="phriction-revert-table">'.
           '<tr><td>%s</td><td>%s</td>'.
         '</table>'.
         '%s'.
       '</div>',
       $comparison_table->render(),
       $navigation_table,
       $revert_l,
       $revert_r,
       $output);
 
 
     $object_box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->appendChild($output);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $object_box,
       ),
       array(
         'title'     => pht('Document History'),
       ));
 
   }
 
   private function renderRevertButton(
     PhrictionContent $content,
     PhrictionContent $current) {
 
     $document_id = $content->getDocumentID();
     $version = $content->getVersion();
 
     $hidden_statuses = array(
       PhrictionChangeType::CHANGE_DELETE    => true, // Silly
       PhrictionChangeType::CHANGE_MOVE_AWAY => true, // Plain silly
       PhrictionChangeType::CHANGE_STUB      => true, // Utterly silly
     );
     if (isset($hidden_statuses[$content->getChangeType()])) {
       // Don't show an edit/revert button for changes which deleted, moved or
       // stubbed the content since it's silly.
       return null;
     }
 
     if ($content->getID() == $current->getID()) {
       return phutil_tag(
         'a',
         array(
           'href'  => '/phriction/edit/'.$document_id.'/',
           'class' => 'button grey',
         ),
         pht('Edit Current Version'));
     }
 
 
     return phutil_tag(
       'a',
       array(
         'href'  => '/phriction/edit/'.$document_id.'/?revert='.$version,
         'class' => 'button grey',
       ),
       pht('Revert to Version %s...', $version));
   }
 
   private function renderComparisonTable(array $content) {
     assert_instances_of($content, 'PhrictionContent');
 
     $user = $this->getRequest()->getUser();
 
     $phids = mpull($content, 'getAuthorPHID');
     $handles = $this->loadViewerHandles($phids);
 
     $list = new PHUIObjectItemListView();
     $list->setFlush(true);
 
     $first = true;
     foreach ($content as $c) {
       $author = $handles[$c->getAuthorPHID()]->renderLink();
       $item = id(new PHUIObjectItemView())
         ->setHeader(pht('%s by %s, %s',
           PhrictionChangeType::getChangeTypeLabel($c->getChangeType()),
           $author,
           pht('Version %s', $c->getVersion())))
         ->addAttribute(pht('%s %s',
           phabricator_date($c->getDateCreated(), $user),
           phabricator_time($c->getDateCreated(), $user)));
 
       if ($c->getDescription()) {
         $item->addAttribute($c->getDescription());
       }
 
       if ($first == true) {
         $item->setBarColor('green');
         $first = false;
       } else {
         $item->setBarColor('red');
       }
 
       $list->addItem($item);
     }
 
     return $list;
   }
 
 }
diff --git a/src/applications/phriction/controller/PhrictionDocumentPreviewController.php b/src/applications/phriction/controller/PhrictionDocumentPreviewController.php
index 6750994e10..8e68d798e5 100644
--- a/src/applications/phriction/controller/PhrictionDocumentPreviewController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentPreviewController.php
@@ -1,29 +1,26 @@
 <?php
 
-/**
- * @group phriction
- */
 final class PhrictionDocumentPreviewController
   extends PhrictionController {
 
   public function processRequest() {
-
     $request = $this->getRequest();
     $document = $request->getStr('document');
 
     $draft_key = $request->getStr('draftkey');
     if ($draft_key) {
       id(new PhabricatorDraft())
         ->setAuthorPHID($request->getUser()->getPHID())
         ->setDraftKey($draft_key)
         ->setDraft($document)
         ->replaceOrDelete();
     }
 
     $content_obj = new PhrictionContent();
     $content_obj->setContent($document);
     $content = $content_obj->renderContent($request->getUser());
 
     return id(new AphrontAjaxResponse())->setContent($content);
   }
+
 }
diff --git a/src/applications/phriction/controller/PhrictionMoveController.php b/src/applications/phriction/controller/PhrictionMoveController.php
index f855fa6be3..c278c4133c 100644
--- a/src/applications/phriction/controller/PhrictionMoveController.php
+++ b/src/applications/phriction/controller/PhrictionMoveController.php
@@ -1,164 +1,161 @@
 <?php
 
-/**
- * @group phriction
- */
-final class PhrictionMoveController
-  extends PhrictionController {
+final class PhrictionMoveController extends PhrictionController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = idx($data, 'id');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     if ($this->id) {
       $document = id(new PhrictionDocumentQuery())
         ->setViewer($user)
         ->withIDs(array($this->id))
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_VIEW,
             PhabricatorPolicyCapability::CAN_EDIT,
           ))
         ->executeOne();
     } else {
       $slug = PhabricatorSlug::normalize(
         $request->getStr('slug'));
       if (!$slug) {
         return new Aphront404Response();
       }
 
       $document = id(new PhrictionDocumentQuery())
         ->setViewer($user)
         ->withSlugs(array($slug))
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_VIEW,
             PhabricatorPolicyCapability::CAN_EDIT,
           ))
         ->executeOne();
     }
 
     if (!$document) {
       return new Aphront404Response();
     }
 
     if (!isset($slug)) {
       $slug = $document->getSlug();
     }
 
     $target_slug = PhabricatorSlug::normalize(
       $request->getStr('new-slug', $slug));
 
     $submit_uri = $request->getRequestURI()->getPath();
     $cancel_uri = PhrictionDocument::getSlugURI($slug);
 
     $errors = array();
     $error_view = null;
     $e_url = null;
 
     $disallowed_statuses = array(
       PhrictionDocumentStatus::STATUS_DELETED => true, // Silly
       PhrictionDocumentStatus::STATUS_MOVED => true, // Plain silly
       PhrictionDocumentStatus::STATUS_STUB => true, // Utterly silly
     );
     if (isset($disallowed_statuses[$document->getStatus()])) {
       $error_dialog = id(new AphrontDialogView())
         ->setUser($user)
         ->setTitle('Can not move page!')
         ->appendChild(pht('An already moved or deleted document '.
           'can not be moved again.'))
         ->addCancelButton($cancel_uri);
 
       return id(new AphrontDialogResponse())->setDialog($error_dialog);
     }
 
     $content = id(new PhrictionContent())->load($document->getContentID());
 
     if ($request->isFormPost() && !count($errors)) {
       if (!count($errors)) { // First check if the target document exists
 
         // NOTE: We use the ominpotent user because we can't let users overwrite
         // documents even if they can't see them.
         $target_document = id(new PhrictionDocumentQuery())
           ->setViewer(PhabricatorUser::getOmnipotentUser())
           ->withSlugs(array($target_slug))
           ->executeOne();
 
         // Considering to overwrite existing docs? Nuke this!
         if ($target_document && $target_document->getStatus() ==
           PhrictionDocumentStatus::STATUS_EXISTS) {
 
           $errors[] = pht('Can not overwrite existing target document.');
           $e_url = pht('Already exists.');
         }
       }
 
       if (!count($errors)) { // I like to move it, move it!
         $from_editor = id(PhrictionDocumentEditor::newForSlug($slug))
           ->setActor($user)
           ->setTitle($content->getTitle())
           ->setContent($content->getContent())
           ->setDescription($content->getDescription());
 
         $target_editor = id(PhrictionDocumentEditor::newForSlug(
           $target_slug))
           ->setActor($user)
           ->setTitle($content->getTitle())
           ->setContent($content->getContent())
           ->setDescription($content->getDescription());
 
         // Move it!
         $target_editor->moveHere($document->getID(), $document->getPHID());
 
         // Retrieve the target doc directly from the editor
         // No need to load it per Sql again
         $target_document = $target_editor->getDocument();
         $from_editor->moveAway($target_document->getID());
 
         $redir_uri = PhrictionDocument::getSlugURI($target_document->getSlug());
         return id(new AphrontRedirectResponse())->setURI($redir_uri);
       }
     }
 
     if ($errors) {
       $error_view = id(new AphrontErrorView())
         ->setErrors($errors);
     }
 
     $form = id(new PHUIFormLayoutView())
       ->setUser($user)
       ->appendChild(
         id(new AphrontFormStaticControl())
           ->setLabel(pht('Title'))
           ->setValue($content->getTitle()))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('New URI'))
           ->setValue($target_slug)
           ->setError($e_url)
           ->setName('new-slug')
           ->setCaption(pht('The new location of the document.')))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Edit Notes'))
           ->setValue($content->getDescription())
           ->setError(null)
           ->setName('description'));
 
     $dialog = id(new AphrontDialogView())
       ->setUser($user)
       ->setTitle(pht('Move Document'))
       ->appendChild($form)
       ->setSubmitURI($submit_uri)
       ->addSubmitButton(pht('Move Document'))
       ->addCancelButton($cancel_uri);
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
+
 }
diff --git a/src/applications/phriction/editor/PhrictionDocumentEditor.php b/src/applications/phriction/editor/PhrictionDocumentEditor.php
index f095abd97c..df5a7a90b4 100644
--- a/src/applications/phriction/editor/PhrictionDocumentEditor.php
+++ b/src/applications/phriction/editor/PhrictionDocumentEditor.php
@@ -1,377 +1,375 @@
 <?php
 
 /**
  * Create or update Phriction documents.
- *
- * @group phriction
  */
 final class PhrictionDocumentEditor extends PhabricatorEditor {
 
   private $document;
   private $content;
 
   private $newTitle;
   private $newContent;
   private $description;
 
   // For the Feed Story when moving documents
   private $fromDocumentPHID;
 
   private function __construct() {
     // <restricted>
   }
 
   public static function newForSlug($slug) {
     $slug = PhabricatorSlug::normalize($slug);
 
     // TODO: Get rid of this.
     $document = id(new PhrictionDocument())->loadOneWhere(
       'slug = %s',
       $slug);
     $content = null;
 
     if ($document) {
       $content = id(new PhrictionContent())->load($document->getContentID());
     } else {
       $document = new PhrictionDocument();
       $document->setSlug($slug);
     }
 
     if (!$content) {
       $default_title = PhabricatorSlug::getDefaultTitle($slug);
       $content = new PhrictionContent();
       $content->setSlug($slug);
       $content->setTitle($default_title);
       $content->setContent('');
     }
 
     $obj = new PhrictionDocumentEditor();
     $obj->document = $document;
     $obj->content  = $content;
 
     return $obj;
   }
 
   public function setTitle($title) {
     $this->newTitle = $title;
     return $this;
   }
 
   public function setContent($content) {
     $this->newContent = $content;
     return $this;
   }
 
   public function setDescription($description) {
     $this->description = $description;
     return $this;
   }
 
   public function getDocument() {
     return $this->document;
   }
 
   public function moveAway($new_doc_id) {
     return $this->execute(
       PhrictionChangeType::CHANGE_MOVE_AWAY, true, $new_doc_id);
   }
 
   public function moveHere($old_doc_id, $old_doc_phid) {
     $this->fromDocumentPHID = $old_doc_phid;
     return $this->execute(
       PhrictionChangeType::CHANGE_MOVE_HERE, false, $old_doc_id);
   }
 
   private function execute(
     $change_type, $del_new_content = true, $doc_ref = null) {
 
     $actor = $this->requireActor();
 
     $document = $this->document;
     $content  = $this->content;
 
     $new_content = $this->buildContentTemplate($document, $content);
     $new_content->setChangeType($change_type);
 
     if ($del_new_content) {
       $new_content->setContent('');
     }
 
     if ($doc_ref) {
       $new_content->setChangeRef($doc_ref);
     }
 
     return $this->updateDocument($document, $content, $new_content);
   }
 
   public function delete() {
     return $this->execute(PhrictionChangeType::CHANGE_DELETE, true);
   }
 
   private function stub() {
     return $this->execute(PhrictionChangeType::CHANGE_STUB, true);
   }
 
   public function save() {
     $actor = $this->requireActor();
 
     if ($this->newContent === '') {
       // If this is an edit which deletes all the content, just treat it as
       // a delete. NOTE: null means "don't change the content", not "delete
       // the page"! Thus the strict type check.
       return $this->delete();
     }
 
     $document = $this->document;
     $content  = $this->content;
 
     $new_content = $this->buildContentTemplate($document, $content);
 
     return $this->updateDocument($document, $content, $new_content);
   }
 
   private function buildContentTemplate(
     PhrictionDocument $document,
     PhrictionContent $content) {
 
     $new_content = new PhrictionContent();
     $new_content->setSlug($document->getSlug());
     $new_content->setAuthorPHID($this->getActor()->getPHID());
     $new_content->setChangeType(PhrictionChangeType::CHANGE_EDIT);
 
     $new_content->setTitle(
       coalesce(
         $this->newTitle,
         $content->getTitle()));
 
     $new_content->setContent(
       coalesce(
         $this->newContent,
         $content->getContent()));
 
     if (strlen($this->description)) {
       $new_content->setDescription($this->description);
     }
 
     return $new_content;
   }
 
   private function updateDocument($document, $content, $new_content) {
 
     $is_new = false;
     if (!$document->getID()) {
       $is_new = true;
     }
 
     $new_content->setVersion($content->getVersion() + 1);
 
     $change_type = $new_content->getChangeType();
     switch ($change_type) {
       case PhrictionChangeType::CHANGE_EDIT:
         $doc_status = PhrictionDocumentStatus::STATUS_EXISTS;
         $feed_action = $is_new
           ? PhrictionActionConstants::ACTION_CREATE
           : PhrictionActionConstants::ACTION_EDIT;
         break;
       case PhrictionChangeType::CHANGE_DELETE:
         $doc_status = PhrictionDocumentStatus::STATUS_DELETED;
         $feed_action = PhrictionActionConstants::ACTION_DELETE;
         if ($is_new) {
           throw new Exception(
             "You can not delete a document which doesn't exist yet!");
         }
         break;
       case PhrictionChangeType::CHANGE_STUB:
         $doc_status = PhrictionDocumentStatus::STATUS_STUB;
         $feed_action = null;
         break;
       case PhrictionChangeType::CHANGE_MOVE_AWAY:
         $doc_status = PhrictionDocumentStatus::STATUS_MOVED;
         $feed_action = null;
         break;
       case PhrictionChangeType::CHANGE_MOVE_HERE:
         $doc_status = PhrictionDocumentStatus::STATUS_EXISTS;
         $feed_action = PhrictionActionConstants::ACTION_MOVE_HERE;
         break;
       default:
         throw new Exception(
           "Unsupported content change type '{$change_type}'!");
     }
 
     $document->setStatus($doc_status);
 
     // TODO: This should be transactional.
 
     if ($is_new) {
       $document->save();
     }
 
     $new_content->setDocumentID($document->getID());
     $new_content->save();
 
     $document->setContentID($new_content->getID());
     $document->save();
 
     $document->attachContent($new_content);
 
     id(new PhabricatorSearchIndexer())
       ->queueDocumentForIndexing($document->getPHID());
 
     // Stub out empty parent documents if they don't exist
     $ancestral_slugs = PhabricatorSlug::getAncestry($document->getSlug());
     if ($ancestral_slugs) {
       $ancestors = id(new PhrictionDocument())->loadAllWhere(
         'slug IN (%Ls)',
         $ancestral_slugs);
       $ancestors = mpull($ancestors, null, 'getSlug');
       foreach ($ancestral_slugs as $slug) {
         // We check for change type to prevent near-infinite recursion
         if (!isset($ancestors[$slug]) &&
           $new_content->getChangeType() != PhrictionChangeType::CHANGE_STUB) {
 
           id(PhrictionDocumentEditor::newForSlug($slug))
             ->setActor($this->getActor())
             ->setTitle(PhabricatorSlug::getDefaultTitle($slug))
             ->setContent('')
             ->setDescription(pht('Empty Parent Document'))
             ->stub();
         }
       }
     }
 
     $project_phid = null;
     $slug = $document->getSlug();
     if (PhrictionDocument::isProjectSlug($slug)) {
       $project = id(new PhabricatorProjectQuery())
         ->setViewer($this->requireActor())
         ->withPhrictionSlugs(array(
           PhrictionDocument::getProjectSlugIdentifier($slug)))
         ->executeOne();
       if ($project) {
         $project_phid = $project->getPHID();
       }
     }
 
     $related_phids = array(
       $document->getPHID(),
       $this->getActor()->getPHID(),
     );
 
     if ($project_phid) {
       $related_phids[] = $project_phid;
     }
 
     if ($this->fromDocumentPHID) {
       $related_phids[] = $this->fromDocumentPHID;
     }
 
     if ($feed_action) {
       id(new PhabricatorFeedStoryPublisher())
         ->setRelatedPHIDs($related_phids)
         ->setStoryAuthorPHID($this->getActor()->getPHID())
         ->setStoryTime(time())
         ->setStoryType(PhabricatorFeedStoryTypeConstants::STORY_PHRICTION)
         ->setStoryData(
           array(
             'phid'      => $document->getPHID(),
             'action'    => $feed_action,
             'content'   => phutil_utf8_shorten($new_content->getContent(), 140),
             'project'   => $project_phid,
             'movedFromPHID' => $this->fromDocumentPHID,
           ))
         ->publish();
     }
 
     // TODO: Migrate to ApplicationTransactions fast, so we get rid of this code
     $subscribers = PhabricatorSubscribersQuery::loadSubscribersForPHID(
       $document->getPHID());
     $this->sendMailToSubscribers($subscribers, $content);
 
     return $this;
   }
 
   private function getChangeTypeDescription($const, $title) {
     $map = array(
       PhrictionChangeType::CHANGE_EDIT =>
         pht('Phriction Document %s was edited.', $title),
       PhrictionChangeType::CHANGE_DELETE =>
         pht('Phriction Document %s was deleted.', $title),
       PhrictionChangeType::CHANGE_MOVE_HERE =>
         pht('Phriction Document %s was moved here.', $title),
       PhrictionChangeType::CHANGE_MOVE_AWAY =>
         pht('Phriction Document %s was moved away.', $title),
       PhrictionChangeType::CHANGE_STUB =>
         pht('Phriction Document %s was created through child.', $title),
     );
     return idx($map, $const, pht('Something magical occurred.'));
   }
 
   private function sendMailToSubscribers(array $subscribers, $old_content) {
     if (!$subscribers) {
       return;
     }
 
     $author_phid = $this->getActor()->getPHID();
     $document = $this->document;
     $content = $document->getContent();
     $slug_uri = PhrictionDocument::getSlugURI($document->getSlug());
     $diff_uri = new PhutilURI('/phriction/diff/'.$document->getID().'/');
     $prod_uri = PhabricatorEnv::getProductionURI('');
 
     $vs_head = $diff_uri
       ->alter('l', $old_content->getVersion())
       ->alter('r', $content->getVersion());
 
     $old_title = $old_content->getTitle();
     $title = $content->getTitle();
     $name = $this->getChangeTypeDescription($content->getChangeType(), $title);
     $action = PhrictionChangeType::getChangeTypeLabel(
       $content->getChangeType());
 
     $body = array($name);
     // Content may have changed, you never know
     if ($content->getChangeType() == PhrictionChangeType::CHANGE_EDIT) {
 
       if ($old_title != $title) {
         $body[] = pht('Title was changed from "%s" to "%s"',
           $old_title, $title);
       }
 
       $body[] = pht("Link to new version:\n%s",
         $prod_uri.$slug_uri.'?v='.$content->getVersion());
 
       $body[] = pht("Link to diff:\n%s", $prod_uri.$vs_head);
     } else if ($content->getChangeType() ==
       PhrictionChangeType::CHANGE_MOVE_AWAY) {
 
       $target_document = id(new PhrictionDocument())
         ->load($content->getChangeRef());
       $slug_uri = PhrictionDocument::getSlugURI($target_document->getSlug());
       $body[] = pht("Link to destination document:\n%s", $prod_uri.$slug_uri);
     }
 
     $body = implode("\n\n", $body);
 
     $subject_prefix = $this->getMailSubjectPrefix();
 
     $mail = new PhabricatorMetaMTAMail();
     $mail->setSubject($name)
       ->setSubjectPrefix($subject_prefix)
       ->setVarySubjectPrefix('['.$action.']')
       ->addHeader('Thread-Topic', $name)
       ->setFrom($author_phid)
       ->addTos($subscribers)
       ->setBody($body)
       ->setRelatedPHID($document->getPHID())
       ->setIsBulk(true);
 
     $mail->saveAndSend();
   }
 
   /* --( For less copy-pasting when switching to ApplicationTransactions )--- */
 
   protected function getMailSubjectPrefix() {
     return PhabricatorEnv::getEnvConfig('metamta.phriction.subject-prefix');
   }
 
 }
diff --git a/src/applications/phriction/remarkup/PhrictionRemarkupRule.php b/src/applications/phriction/remarkup/PhrictionRemarkupRule.php
index c6ae9f5b14..b8f61b2c02 100644
--- a/src/applications/phriction/remarkup/PhrictionRemarkupRule.php
+++ b/src/applications/phriction/remarkup/PhrictionRemarkupRule.php
@@ -1,53 +1,49 @@
 <?php
 
-/**
- * @group markup
- */
-final class PhrictionRemarkupRule
-  extends PhutilRemarkupRule {
+final class PhrictionRemarkupRule extends PhutilRemarkupRule {
 
   public function getPriority() {
     return 350.0;
   }
 
   public function apply($text) {
     return preg_replace_callback(
       '@\B\\[\\[([^|\\]]+)(?:\\|([^\\]]+))?\\]\\]\B@U',
       array($this, 'markupDocumentLink'),
       $text);
   }
 
   public function markupDocumentLink($matches) {
 
     $link = trim($matches[1]);
     $name = trim(idx($matches, 2, $link));
     if (empty($matches[2])) {
       $name = explode('/', trim($name, '/'));
       $name = end($name);
     }
 
     $uri      = new PhutilURI($link);
     $slug     = $uri->getPath();
     $fragment = $uri->getFragment();
     $slug     = PhabricatorSlug::normalize($slug);
     $slug     = PhrictionDocument::getSlugURI($slug);
     $href     = (string)id(new PhutilURI($slug))->setFragment($fragment);
 
     if ($this->getEngine()->getState('toc')) {
       $text = $name;
     } else if ($this->getEngine()->isTextMode()) {
       return PhabricatorEnv::getProductionURI($href);
     } else {
       $text = $this->newTag(
         'a',
         array(
           'href'  => $href,
           'class' => 'phriction-link',
         ),
         $name);
     }
 
     return $this->getEngine()->storeText($text);
   }
 
 }
diff --git a/src/applications/phriction/storage/PhrictionContent.php b/src/applications/phriction/storage/PhrictionContent.php
index d40aec3c05..9e43700cda 100644
--- a/src/applications/phriction/storage/PhrictionContent.php
+++ b/src/applications/phriction/storage/PhrictionContent.php
@@ -1,98 +1,96 @@
 <?php
 
 /**
  * @task markup Markup Interface
- *
- * @group phriction
  */
 final class PhrictionContent extends PhrictionDAO
   implements PhabricatorMarkupInterface {
 
   const MARKUP_FIELD_BODY = 'markup:body';
 
   protected $id;
   protected $documentID;
   protected $version;
   protected $authorPHID;
 
   protected $title;
   protected $slug;
   protected $content;
   protected $description;
 
   protected $changeType;
   protected $changeRef;
 
   public function renderContent(PhabricatorUser $viewer) {
     return PhabricatorMarkupEngine::renderOneObject(
       $this,
       self::MARKUP_FIELD_BODY,
       $viewer);
   }
 
 
 /* -(  Markup Interface  )--------------------------------------------------- */
 
 
   /**
    * @task markup
    */
   public function getMarkupFieldKey($field) {
     if ($this->shouldUseMarkupCache($field)) {
       $id = $this->getID();
     } else {
       $id = PhabricatorHash::digest($this->getMarkupText($field));
     }
     return "phriction:{$field}:{$id}";
   }
 
 
   /**
    * @task markup
    */
   public function getMarkupText($field) {
     return $this->getContent();
   }
 
 
   /**
    * @task markup
    */
   public function newMarkupEngine($field) {
     return PhabricatorMarkupEngine::newPhrictionMarkupEngine();
   }
 
 
   /**
    * @task markup
    */
   public function didMarkupText(
     $field,
     $output,
     PhutilMarkupEngine $engine) {
 
     $toc = PhutilRemarkupEngineRemarkupHeaderBlockRule::renderTableOfContents(
       $engine);
 
     if ($toc) {
       $toc = phutil_tag_div('phabricator-remarkup-toc', array(
         phutil_tag_div(
           'phabricator-remarkup-toc-header',
           pht('Table of Contents')),
         $toc,
       ));
     }
 
     return phutil_tag_div('phabricator-remarkup', array($toc, $output));
   }
 
 
   /**
    * @task markup
    */
   public function shouldUseMarkupCache($field) {
     return (bool)$this->getID();
   }
 
 
 }
diff --git a/src/applications/phriction/storage/PhrictionDAO.php b/src/applications/phriction/storage/PhrictionDAO.php
index 76a6338127..6211c5561d 100644
--- a/src/applications/phriction/storage/PhrictionDAO.php
+++ b/src/applications/phriction/storage/PhrictionDAO.php
@@ -1,12 +1,9 @@
 <?php
 
-/**
- * @group phriction
- */
 abstract class PhrictionDAO extends PhabricatorLiskDAO {
 
   public function getApplicationName() {
     return 'phriction';
   }
 
 }
diff --git a/src/applications/phriction/storage/__tests__/PhrictionDocumentTestCase.php b/src/applications/phriction/storage/__tests__/PhrictionDocumentTestCase.php
index 1d1c22c77f..ede8ec3429 100644
--- a/src/applications/phriction/storage/__tests__/PhrictionDocumentTestCase.php
+++ b/src/applications/phriction/storage/__tests__/PhrictionDocumentTestCase.php
@@ -1,51 +1,48 @@
 <?php
 
-/**
- * @group phriction
- */
 final class PhrictionDocumentTestCase extends PhabricatorTestCase {
 
   public function testProjectSlugs() {
     $slugs = array(
       '/'                   => false,
       'zebra/'              => false,
       'projects/'           => false,
       'projects/a/'         => true,
       'projects/a/b/'       => true,
       'stuff/projects/a/'   => false,
     );
 
     foreach ($slugs as $slug => $expect) {
       $this->assertEqual(
         $expect,
         PhrictionDocument::isProjectSlug($slug),
         "Is '{$slug}' a project slug?");
     }
   }
 
   public function testProjectSlugIdentifiers() {
     $slugs = array(
       'projects/'     => null,
       'derp/'         => null,
       'projects/a/'   => 'a/',
       'projects/a/b/' => 'a/',
     );
 
     foreach ($slugs as $slug => $expect) {
       $ex = null;
       $result = null;
       try {
         $result = PhrictionDocument::getProjectSlugIdentifier($slug);
       } catch (Exception $e) {
         $ex = $e;
       }
 
       if ($expect === null) {
         $this->assertTrue((bool)$ex, "Slug '{$slug}' is invalid.");
       } else {
         $this->assertEqual($expect, $result, "Slug '{$slug}' identifier.");
       }
     }
   }
 
 }
diff --git a/src/applications/ponder/constants/PonderQuestionStatus.php b/src/applications/ponder/constants/PonderQuestionStatus.php
index 4480b8f48e..8d2a878234 100644
--- a/src/applications/ponder/constants/PonderQuestionStatus.php
+++ b/src/applications/ponder/constants/PonderQuestionStatus.php
@@ -1,34 +1,31 @@
 <?php
 
-/**
- * @group ponder
- */
 final class PonderQuestionStatus extends PonderConstants {
 
   const STATUS_OPEN     = 0;
   const STATUS_CLOSED   = 1;
 
   public static function getQuestionStatusMap() {
     return array(
       self::STATUS_OPEN     => pht('Open'),
       self::STATUS_CLOSED   => pht('Closed'),
     );
   }
 
   public static function getQuestionStatusFullName($status) {
     $map = array(
       self::STATUS_OPEN     => pht('Open'),
       self::STATUS_CLOSED   => pht('Closed by author'),
     );
     return idx($map, $status, '???');
   }
 
   public static function getQuestionStatusTagColor($status) {
     $map = array(
       self::STATUS_CLOSED => PHUITagView::COLOR_BLACK,
     );
 
     return idx($map, $status);
   }
 
 }
diff --git a/src/applications/ponder/constants/PonderVote.php b/src/applications/ponder/constants/PonderVote.php
index 098362dab7..5ac1efdd3a 100644
--- a/src/applications/ponder/constants/PonderVote.php
+++ b/src/applications/ponder/constants/PonderVote.php
@@ -1,11 +1,9 @@
 <?php
-/**
- * @group ponder
- */
+
 final class PonderVote extends PonderConstants {
 
   const VOTE_UP = 1;
   const VOTE_NONE = 0;
   const VOTE_DOWN = -1;
 
 }
diff --git a/src/applications/project/conduit/ConduitAPI_project_Method.php b/src/applications/project/conduit/ConduitAPI_project_Method.php
index 1bf0260587..12c191e75c 100644
--- a/src/applications/project/conduit/ConduitAPI_project_Method.php
+++ b/src/applications/project/conduit/ConduitAPI_project_Method.php
@@ -1,47 +1,44 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class ConduitAPI_project_Method extends ConduitAPIMethod {
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
       'PhabricatorApplicationProject');
   }
 
   protected function buildProjectInfoDictionary(PhabricatorProject $project) {
     $results = $this->buildProjectInfoDictionaries(array($project));
     return idx($results, $project->getPHID());
   }
 
   protected function buildProjectInfoDictionaries(array $projects) {
     assert_instances_of($projects, 'PhabricatorProject');
     if (!$projects) {
       return array();
     }
 
     $result = array();
     foreach ($projects as $project) {
 
       $member_phids = $project->getMemberPHIDs();
       $member_phids = array_values($member_phids);
 
       $project_slugs = $project->getSlugs();
       $project_slugs = array_values(mpull($project_slugs, 'getSlug'));
 
       $result[$project->getPHID()] = array(
         'id'            => $project->getID(),
         'phid'          => $project->getPHID(),
         'name'          => $project->getName(),
         'members'       => $member_phids,
         'slugs'         => $project_slugs,
         'dateCreated'   => $project->getDateCreated(),
         'dateModified'  => $project->getDateModified(),
       );
     }
 
     return $result;
   }
 
 }
diff --git a/src/applications/project/conduit/ConduitAPI_project_query_Method.php b/src/applications/project/conduit/ConduitAPI_project_query_Method.php
index 74905bf616..f7a451ec1e 100644
--- a/src/applications/project/conduit/ConduitAPI_project_query_Method.php
+++ b/src/applications/project/conduit/ConduitAPI_project_query_Method.php
@@ -1,108 +1,105 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_project_query_Method extends ConduitAPI_project_Method {
 
   public function getMethodDescription() {
     return 'Execute searches for Projects.';
   }
 
   public function defineParamTypes() {
 
     $statuses = array(
       PhabricatorProjectQuery::STATUS_ANY,
       PhabricatorProjectQuery::STATUS_OPEN,
       PhabricatorProjectQuery::STATUS_CLOSED,
       PhabricatorProjectQuery::STATUS_ACTIVE,
       PhabricatorProjectQuery::STATUS_ARCHIVED,
     );
 
     $status_const = $this->formatStringConstants($statuses);
 
     return array(
       'ids'               => 'optional list<int>',
       'phids'             => 'optional list<phid>',
       'slugs'             => 'optional list<string>',
       'status'            => 'optional '.$status_const,
 
       'members'           => 'optional list<phid>',
 
       'limit'             => 'optional int',
       'offset'            => 'optional int',
     );
   }
 
   public function defineReturnType() {
     return 'list';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $query = new PhabricatorProjectQuery();
     $query->setViewer($request->getUser());
     $query->needMembers(true);
     $query->needSlugs(true);
 
     $ids = $request->getValue('ids');
     if ($ids) {
       $query->withIDs($ids);
     }
 
     $status = $request->getValue('status');
     if ($status) {
       $query->withStatus($status);
     }
 
     $phids = $request->getValue('phids');
     if ($phids) {
       $query->withPHIDs($phids);
     }
 
     $slugs = $request->getValue('slugs');
     if ($slugs) {
       $query->withSlugs($slugs);
     }
 
     $members = $request->getValue('members');
     if ($members) {
       $query->withMemberPHIDs($members);
     }
 
     $limit = $request->getValue('limit');
     if ($limit) {
       $query->setLimit($limit);
     }
 
     $offset = $request->getValue('offset');
     if ($offset) {
       $query->setOffset($offset);
     }
 
     $pager = $this->newPager($request);
     $results = $query->executeWithCursorPager($pager);
     $projects = $this->buildProjectInfoDictionaries($results);
 
     // TODO: This is pretty hideous.
     $slug_map = array();
     foreach ($slugs as $slug) {
       foreach ($projects as $project) {
         if (in_array($slug, $project['slugs'])) {
           $slug_map[$slug] = $project['phid'];
         }
       }
     }
 
     $result = array(
       'data' => $projects,
       'slugMap' => $slug_map,
     );
 
     return $this->addPagerResults($result, $pager);
   }
 
 }
diff --git a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getbranchcommitmessage_Method.php b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getbranchcommitmessage_Method.php
index d93da01a34..68118d49ea 100644
--- a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getbranchcommitmessage_Method.php
+++ b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getbranchcommitmessage_Method.php
@@ -1,100 +1,100 @@
 <?php
 
 final class ConduitAPI_releephwork_getbranchcommitmessage_Method
   extends ConduitAPI_releeph_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
     return 'Get a commit message for committing a Releeph branch.';
   }
 
   public function defineParamTypes() {
     return array(
       'branchPHID'  => 'required string',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty string';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $viewer = $request->getUser();
 
     $branch = id(new ReleephBranchQuery())
       ->setViewer($viewer)
       ->withPHIDs(array($request->getValue('branchPHID')))
       ->executeOne();
 
     $project = $branch->getProduct();
 
     $creator_phid = $branch->getCreatedByUserPHID();
     $cut_phid = $branch->getCutPointCommitPHID();
 
     $phids = array(
       $branch->getPHID(),
       $project->getPHID(),
       $creator_phid,
       $cut_phid,
     );
 
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($request->getUser())
       ->withPHIDs($phids)
       ->execute();
 
     $h_branch = $handles[$branch->getPHID()];
     $h_project = $handles[$project->getPHID()];
 
-    // Not as customizable as a ReleephRequest's commit message.  It doesn't
+    // Not as customizable as a ReleephRequest's commit message. It doesn't
     // really need to be.
     // TODO: Yes it does, see FB-specific stuff below.
     $commit_message = array();
     $commit_message[] = $h_branch->getFullName();
     $commit_message[] = $h_branch->getURI();
 
     $commit_message[] = 'Cut Point: '.$handles[$cut_phid]->getName();
 
     $cut_point_pr_commit = id(new PhabricatorRepositoryCommit())
       ->loadOneWhere('phid = %s', $cut_phid);
     $cut_point_commit_date = strftime(
       '%Y-%m-%d %H:%M:%S%z',
       $cut_point_pr_commit->getEpoch());
     $commit_message[] = "Cut Point Date: {$cut_point_commit_date}";
 
     $commit_message[] = 'Created By: '.$handles[$creator_phid]->getName();
 
     $project_uri = $project->getURI();
     $commit_message[] = 'Project: '.$h_project->getName().' '.$project_uri;
 
     /**
      * Required for 090-limit_new_branch_creations.sh in
      * admin/scripts/git/hosting/hooks/update.d (in the E repo):
      *
      *   http://fburl.com/2372545
      *
      * The commit message must have a line saying:
      *
      *   @new-branch: <branch-name>
      *
      */
     $repo = $project->getRepository();
     switch ($repo->getVersionControlSystem()) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         $commit_message[] = sprintf(
           '@new-branch: %s',
           $branch->getName());
         break;
     }
 
     return implode("\n\n", $commit_message);
   }
 
 }
diff --git a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_nextrequest_Method.php b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_nextrequest_Method.php
index 7082aaba28..d355356aa8 100644
--- a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_nextrequest_Method.php
+++ b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_nextrequest_Method.php
@@ -1,223 +1,223 @@
 <?php
 
 final class ConduitAPI_releephwork_nextrequest_Method
   extends ConduitAPI_releeph_Method {
 
   private $project;
   private $branch;
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodDescription() {
     return
       'Return info required to cut a branch, '.
       'and pick and revert ReleephRequests';
   }
 
   public function defineParamTypes() {
     return array(
       'branchPHID'  => 'required phid',
       'seen'        => 'required map<string, bool>',
     );
   }
 
   public function defineReturnType() {
     return '';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-NOT-PUSHER' =>
         'You are not listed as a pusher for thie Releeph project!',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $viewer = $request->getUser();
     $seen = $request->getValue('seen');
 
     $branch = id(new ReleephBranchQuery())
       ->setViewer($viewer)
       ->withPHIDs(array($request->getValue('branchPHID')))
       ->executeOne();
 
     $project = $branch->getProduct();
 
     $needs_pick = array();
     $needs_revert = array();
 
     // Load every request ever made for this branch...?!!!
     $releeph_requests = id(new ReleephRequestQuery())
       ->setViewer($viewer)
       ->withBranchIDs(array($branch->getID()))
       ->execute();
 
     foreach ($releeph_requests as $candidate) {
       $phid = $candidate->getPHID();
       if (idx($seen, $phid)) {
         continue;
       }
 
       $should = $candidate->shouldBeInBranch();
       $in = $candidate->getInBranch();
       if ($should && !$in) {
         $needs_pick[] = $candidate;
       }
       if (!$should && $in) {
         $needs_revert[] = $candidate;
       }
     }
 
     /**
      * Sort both needs_pick and needs_revert in ascending commit order, as
      * discovered by Phabricator (using the `id` column to perform that
      * ordering).
      *
-     * This is easy for $needs_pick as the ordinal is stored.  It is hard for
+     * This is easy for $needs_pick as the ordinal is stored. It is hard for
      * reverts, as we have to look that information up.
      */
     $needs_pick = $this->sortPicks($needs_pick);
     $needs_revert = $this->sortReverts($needs_revert);
 
     /**
      * Do reverts first in reverse order, then the picks in original-commit
      * order.
      *
      * This seems like the correct thing to do, but there may be a better
      * algorithm for the releephwork.nextrequest Conduit call that orders
      * things better.
      *
      * We could also button-mash our way through everything that failed (at the
      * end of the run) to try failed things again.
      */
     $releeph_request = null;
     $action = null;
     if ($needs_revert) {
       $releeph_request = last($needs_revert);
       $action = 'revert';
       $commit_id = $releeph_request->getCommitIdentifier();
       $commit_phid = $releeph_request->getCommitPHID();
     } else if ($needs_pick) {
       $releeph_request = head($needs_pick);
       $action = 'pick';
       $commit = $releeph_request->loadPhabricatorRepositoryCommit();
       $commit_id = $commit->getCommitIdentifier();
       $commit_phid = $commit->getPHID();
     } else {
       // Return early if there's nothing to do!
       return array();
     }
 
     // Build the response
     $phids = array();
     $phids[] = $commit_phid;
 
     $diff_phid = null;
     $diff_rev_id = null;
 
     $requested_object = $releeph_request->getRequestedObject();
     if ($requested_object instanceof DifferentialRevision) {
       $diff_rev = $requested_object;
     } else {
       $diff_rev = null;
     }
 
     if ($diff_rev) {
       $diff_phid = $diff_rev->getPHID();
       $phids[] = $diff_phid;
       $diff_rev_id = $diff_rev->getID();
     }
 
     $phids[] = $releeph_request->getPHID();
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($request->getUser())
       ->withPHIDs($phids)
       ->execute();
 
     $diff_name = null;
     if ($diff_rev) {
       $diff_name = $handles[$diff_phid]->getName();
     }
 
     $new_author_phid = null;
     if ($diff_rev) {
       $new_author_phid = $diff_rev->getAuthorPHID();
     } else {
       $pr_commit = $releeph_request->loadPhabricatorRepositoryCommit();
       if ($pr_commit) {
         $new_author_phid = $pr_commit->getAuthorPHID();
       }
     }
 
     return array(
       'requestID'         => $releeph_request->getID(),
       'requestPHID'       => $releeph_request->getPHID(),
       'requestName'       => $handles[$releeph_request->getPHID()]->getName(),
       'requestorPHID'     => $releeph_request->getRequestUserPHID(),
       'action'            => $action,
       'diffRevID'         => $diff_rev_id,
       'diffName'          => $diff_name,
       'commitIdentifier'  => $commit_id,
       'commitPHID'        => $commit_phid,
       'commitName'        => $handles[$commit_phid]->getName(),
       'needsRevert'       => mpull($needs_revert, 'getID'),
       'needsPick'         => mpull($needs_pick, 'getID'),
       'newAuthorPHID'     => $new_author_phid,
     );
   }
 
   private function sortPicks(array $releeph_requests) {
     $surrogate = array();
     foreach ($releeph_requests as $rq) {
       // TODO: it's likely that relying on the `id` column to provide
       // trunk-commit-order is thoroughly broken.
       $ordinal = (int) $rq->loadPhabricatorRepositoryCommit()->getID();
       $surrogate[$ordinal] = $rq;
     }
     ksort($surrogate);
     return $surrogate;
   }
 
   /**
    * Sort an array of ReleephRequests, that have been picked into a branch, in
    * the order in which they were picked to the branch.
    */
   private function sortReverts(array $releeph_requests) {
     if (!$releeph_requests) {
       return array();
     }
 
     // ReleephRequests, keyed by <branch-commit-id>
     $releeph_requests = mpull($releeph_requests, null, 'getCommitIdentifier');
 
     $commits = id(new PhabricatorRepositoryCommit())
       ->loadAllWhere(
         'commitIdentifier IN (%Ls)',
         mpull($releeph_requests, 'getCommitIdentifier'));
 
     // A map of <branch-commit-id> => <branch-commit-ordinal>
     $surrogate = mpull($commits, 'getID', 'getCommitIdentifier');
 
     $unparsed = array();
     $result = array();
 
     foreach ($releeph_requests as $commit_id => $releeph_request) {
       $ordinal = idx($surrogate, $commit_id);
       if ($ordinal) {
         $result[$ordinal] = $releeph_request;
       } else {
         $unparsed[] = $releeph_request;
       }
     }
 
     // Sort $result in ascending order
     ksort($result);
 
     // Unparsed commits we'll just have to guess, based on time
     $unparsed = msort($unparsed, 'getDateModified');
 
     return array_merge($result, $unparsed);
   }
 }
diff --git a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_record_Method.php b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_record_Method.php
index bea2b28e0e..3773e2e6b1 100644
--- a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_record_Method.php
+++ b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_record_Method.php
@@ -1,75 +1,75 @@
 <?php
 
 final class ConduitAPI_releephwork_record_Method
   extends ConduitAPI_releeph_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   /**
    * Record that a request was committed locally, and is about to be pushed to
    * the remote repository.
    *
    * This lets us mark a ReleephRequest as being in a branch in real time so
    * that no one else tries to pick it.
    *
    * When the daemons discover this commit in the repository with
    * DifferentialReleephRequestFieldSpecification, we'll be able to record the
-   * commit's PHID as well.  That process is slow though, and we don't want to
+   * commit's PHID as well. That process is slow though, and we don't want to
    * wait a whole minute before marking something as cleanly picked or
    * reverted.
    */
   public function getMethodDescription() {
     return 'Record whether we committed a pick or revert '.
       'to the upstream repository.';
   }
 
   public function defineParamTypes() {
     $action_const = $this->formatStringConstants(
       array(
         'pick',
         'revert',
       ));
 
     return array(
       'requestPHID'       => 'required string',
       'action'            => 'required '.$action_const,
       'commitIdentifier'  => 'required string',
     );
   }
 
   public function defineReturnType() {
     return 'void';
   }
 
   public function defineErrorTypes() {
     return array();
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $action = $request->getValue('action');
     $new_commit_id = $request->getValue('commitIdentifier');
 
     $releeph_request = id(new ReleephRequest())
       ->loadOneWhere('phid = %s', $request->getValue('requestPHID'));
 
     $xactions = array();
 
     $xactions[] = id(new ReleephRequestTransaction())
       ->setTransactionType(ReleephRequestTransaction::TYPE_COMMIT)
       ->setMetadataValue('action', $action)
       ->setNewValue($new_commit_id);
 
     $editor = id(new ReleephRequestTransactionalEditor())
       ->setActor($request->getUser())
       ->setContinueOnNoEffect(true)
       ->setContentSource(
         PhabricatorContentSource::newForSource(
           PhabricatorContentSource::SOURCE_CONDUIT,
           array()));
 
     $editor->applyTransactions($releeph_request, $xactions);
   }
 
 }
diff --git a/src/applications/releeph/config/PhabricatorApplicationReleephConfigOptions.php b/src/applications/releeph/config/PhabricatorApplicationReleephConfigOptions.php
index 9054122d29..d32db47069 100644
--- a/src/applications/releeph/config/PhabricatorApplicationReleephConfigOptions.php
+++ b/src/applications/releeph/config/PhabricatorApplicationReleephConfigOptions.php
@@ -1,74 +1,74 @@
 <?php
 
 final class PhabricatorApplicationReleephConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
     return pht('Releeph');
   }
 
   public function getDescription() {
     return pht('Options for configuring Releeph, the release branch tool.');
   }
 
   public function getOptions() {
 
     $default_fields = array(
       new ReleephSummaryFieldSpecification(),
       new ReleephRequestorFieldSpecification(),
       new ReleephSeverityFieldSpecification(),
       new ReleephIntentFieldSpecification(),
       new ReleephReasonFieldSpecification(),
       new ReleephAuthorFieldSpecification(),
       new ReleephRevisionFieldSpecification(),
       new ReleephOriginalCommitFieldSpecification(),
       new ReleephBranchCommitFieldSpecification(),
       new ReleephDiffSizeFieldSpecification(),
       new ReleephDiffChurnFieldSpecification(),
       new ReleephDiffMessageFieldSpecification(),
       new ReleephCommitMessageFieldSpecification(),
     );
 
     $default = array();
     foreach ($default_fields as $default_field) {
       $default[$default_field->getFieldKey()] = true;
     }
 
     foreach ($default as $key => $enabled) {
       $default[$key] = array(
         'disabled' => !$enabled,
       );
     }
 
     $custom_field_type = 'custom:PhabricatorCustomFieldConfigOptionType';
 
     return array(
       $this->newOption('releeph.installed', 'bool', false)
         ->setSummary(pht('Enable the Releeph application.'))
         ->setDescription(
           pht(
             'Releeph, a tool for managing release branches, will eventually '.
             'fit in to the Phabricator suite as a general purpose tool. '.
             'However Releeph is currently unstable in multiple ways that may '.
             'not migrate properly for you: the code is still in alpha stage '.
             'of design, the storage format is likely to change in unexpected '.
             'ways, and the workflows presented are very specific to a core '.
             'set of alpha testers at Facebook.  For the time being you are '.
             'strongly discouraged from relying on Releeph being at all '.
             'stable.')),
       $this->newOption('releeph.fields', $custom_field_type, $default)
         ->setCustomData('ReleephFieldSpecification'),
       $this->newOption(
         'releeph.default-branch-template',
         'string',
         'releases/%P/%p-%Y%m%d-%v')
         ->setDescription(
           pht(
             'The default branch template for new branches in unconfigured '.
-            'Releeph projects.  This is also configurable on a per-project '.
+            'Releeph projects. This is also configurable on a per-project '.
             'basis.')),
     );
   }
 
 
 }
diff --git a/src/applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php b/src/applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php
index e0f3eef1bd..658c98eb53 100644
--- a/src/applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php
+++ b/src/applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php
@@ -1,106 +1,106 @@
 <?php
 
 // TODO: After T2222, this is likely unreachable?
 
 final class ReleephRequestDifferentialCreateController
   extends ReleephController {
 
   private $revisionID;
   private $revision;
 
   public function willProcessRequest(array $data) {
     $this->revisionID = $data['diffRevID'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $diff_rev = id(new DifferentialRevisionQuery())
       ->setViewer($user)
       ->withIDs(array($this->revisionID))
       ->executeOne();
     if (!$diff_rev) {
       return new Aphront404Response();
     }
     $this->revision = $diff_rev;
 
     $arc_project = id(new PhabricatorRepositoryArcanistProject())
       ->loadOneWhere('phid = %s', $this->revision->getArcanistProjectPHID());
 
     $projects = id(new ReleephProject())->loadAllWhere(
       'arcanistProjectID = %d AND isActive = 1',
       $arc_project->getID());
     if (!$projects) {
       throw new Exception(sprintf(
         "D%d belongs to the '%s' Arcanist project, ".
         "which is not part of any Releeph project!",
         $this->revision->getID(),
         $arc_project->getName()));
     }
 
     $branches = id(new ReleephBranch())->loadAllWhere(
       'releephProjectID IN (%Ld) AND isActive = 1',
       mpull($projects, 'getID'));
     if (!$branches) {
       throw new Exception(sprintf(
         'D%d could be in the Releeph project(s) %s, '.
         'but this project / none of these projects have open branches.',
         $this->revision->getID(),
         implode(', ', mpull($projects, 'getName'))));
     }
 
     if (count($branches) === 1) {
       return id(new AphrontRedirectResponse())
         ->setURI($this->buildReleephRequestURI(head($branches)));
     }
 
     $projects = msort(
       mpull($projects, null, 'getID'),
       'getName');
 
     $branch_groups = mgroup($branches, 'getReleephProjectID');
 
     require_celerity_resource('releeph-request-differential-create-dialog');
     $dialog = id(new AphrontDialogView())
       ->setUser($user)
       ->setTitle(pht('Choose Releeph Branch'))
       ->setClass('releeph-request-differential-create-dialog')
       ->addCancelButton('/D'.$request->getStr('D'));
 
     $dialog->appendChild(
       pht('This differential revision changes code that is associated '.
-      'with multiple Releeph branches.  '.
+      'with multiple Releeph branches. '.
       'Please select the branch where you would like this code to be picked.'));
 
     foreach ($branch_groups as $project_id => $branches) {
       $project = idx($projects, $project_id);
       $dialog->appendChild(
         phutil_tag(
           'h1',
           array(),
           $project->getName()));
       $branches = msort($branches, 'getBasename');
       foreach ($branches as $branch) {
         $uri = $this->buildReleephRequestURI($branch);
         $dialog->appendChild(
           phutil_tag(
             'a',
             array(
               'href' => $uri,
             ),
             $branch->getDisplayNameWithDetail()));
       }
     }
 
     return id(new AphrontDialogResponse)
       ->setDialog($dialog);
   }
 
   private function buildReleephRequestURI(ReleephBranch $branch) {
     $uri = $branch->getURI('request/');
     return id(new PhutilURI($uri))
       ->setQueryParam('D', $this->revision->getID());
   }
 
 }
diff --git a/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php b/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php
index d6572a3550..02ffa826b2 100644
--- a/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php
+++ b/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php
@@ -1,371 +1,371 @@
 <?php
 
 /**
  * This DifferentialFieldSpecification exists for two reason:
  *
  * 1: To parse "Releeph: picks RQ<nn>" headers in commits created by
  * arc-releeph so that RQs committed by arc-releeph have real
  * PhabricatorRepositoryCommits associated with them (instaed of just the SHA
  * of the commit, as seen by the pusher).
  *
  * 2: If requestors want to commit directly to their release branch, they can
  * use this header to (i) indicate on a differential revision that this
  * differential revision is for the release branch, and (ii) when they land
  * their diff on to the release branch manually, the ReleephRequest is
  * automatically updated (instead of having to use the "Mark Manually Picked"
  * button.)
  *
  */
 final class DifferentialReleephRequestFieldSpecification {
 
   // TODO: This class is essentially dead right now, see T2222.
 
   const ACTION_PICKS    = 'picks';
   const ACTION_REVERTS  = 'reverts';
 
   private $releephAction;
   private $releephPHIDs = array();
 
   public function getStorageKey() {
     return 'releeph:actions';
   }
 
   public function getValueForStorage() {
     return json_encode(array(
       'releephAction' => $this->releephAction,
       'releephPHIDs'  => $this->releephPHIDs,
     ));
   }
 
   public function setValueFromStorage($json) {
     if ($json) {
       $dict = json_decode($json, true);
       $this->releephAction = idx($dict, 'releephAction');
       $this->releephPHIDs = idx($dict, 'releephPHIDs');
     }
     return $this;
   }
 
   public function shouldAppearOnRevisionView() {
     return true;
   }
 
   public function renderLabelForRevisionView() {
     return 'Releeph';
   }
 
   public function getRequiredHandlePHIDs() {
     return mpull($this->loadReleephRequests(), 'getPHID');
   }
 
   public function renderValueForRevisionView() {
     static $tense = array(
       self::ACTION_PICKS => array(
         'future'  => 'Will pick',
         'past'    => 'Picked',
       ),
       self::ACTION_REVERTS => array(
         'future'  => 'Will revert',
         'past'    => 'Reverted',
       ),
     );
 
     $releeph_requests = $this->loadReleephRequests();
     if (!$releeph_requests) {
       return null;
     }
 
     $status = $this->getRevision()->getStatus();
     if ($status == ArcanistDifferentialRevisionStatus::CLOSED) {
       $verb = $tense[$this->releephAction]['past'];
     } else {
       $verb = $tense[$this->releephAction]['future'];
     }
 
     $parts = hsprintf('%s...', $verb);
     foreach ($releeph_requests as $releeph_request) {
       $parts->appendHTML(phutil_tag('br'));
       $parts->appendHTML(
         $this->getHandle($releeph_request->getPHID())->renderLink());
     }
 
     return $parts;
   }
 
   public function shouldAppearOnCommitMessage() {
     return true;
   }
 
   public function getCommitMessageKey() {
     return 'releephActions';
   }
 
   public function setValueFromParsedCommitMessage($dict) {
     $this->releephAction = $dict['releephAction'];
     $this->releephPHIDs = $dict['releephPHIDs'];
     return $this;
   }
 
   public function renderValueForCommitMessage($is_edit) {
     $releeph_requests = $this->loadReleephRequests();
     if (!$releeph_requests) {
       return null;
     }
 
     $parts = array($this->releephAction);
     foreach ($releeph_requests as $releeph_request) {
       $parts[] = 'RQ'.$releeph_request->getID();
     }
 
     return implode(' ', $parts);
   }
 
   /**
    * Releeph fields should look like:
    *
    *   Releeph: picks RQ1 RQ2, RQ3
    *   Releeph: reverts RQ1
    */
   public function parseValueFromCommitMessage($value) {
     /**
      * Releeph commit messages look like this (but with more blank lines,
      * omitted here):
      *
      *   Make CaptainHaddock more reasonable
      *   Releeph: picks RQ1
      *   Requested By: edward
      *   Approved By: edward (requestor)
      *   Request Reason: x
      *   Summary: Make the Haddock implementation more reasonable.
      *   Test Plan: none
      *   Reviewers: user1
      *
      * Some of these fields are recognized by Differential (e.g. "Requested
-     * By").  They are folded up into the "Releeph" field, parsed by this
-     * class.  As such $value includes more than just the first-line:
+     * By"). They are folded up into the "Releeph" field, parsed by this
+     * class. As such $value includes more than just the first-line:
      *
      *   "picks RQ1\n\nRequested By: edward\n\nApproved By: edward (requestor)"
      *
      * To hack around this, just consider the first line of $value when
      * determining what Releeph actions the parsed commit is performing.
      */
     $first_line = head(array_filter(explode("\n", $value)));
 
     $tokens = preg_split('/\s*,?\s+/', $first_line);
     $raw_action = array_shift($tokens);
     $action = strtolower($raw_action);
 
     if (!$action) {
       return null;
     }
 
     switch ($action) {
       case self::ACTION_REVERTS:
       case self::ACTION_PICKS:
         break;
 
       default:
         throw new DifferentialFieldParseException(
           "Commit message contains unknown Releeph action '{$raw_action}'!");
         break;
     }
 
     $releeph_requests = array();
     foreach ($tokens as $token) {
       $match = array();
       if (!preg_match('/^(?:RQ)?(\d+)$/i', $token, $match)) {
         $label = $this->renderLabelForCommitMessage();
         throw new DifferentialFieldParseException(
           "Commit message contains unparseable ".
           "Releeph request token '{$token}'!");
       }
 
       $id = (int) $match[1];
       $releeph_request = id(new ReleephRequest())->load($id);
 
       if (!$releeph_request) {
         throw new DifferentialFieldParseException(
           "Commit message references non existent releeph request: {$value}!");
       }
 
       $releeph_requests[] = $releeph_request;
     }
 
     if (count($releeph_requests) > 1) {
       $rqs_seen = array();
       $groups = array();
       foreach ($releeph_requests as $releeph_request) {
         $releeph_branch = $releeph_request->getBranch();
         $branch_name = $releeph_branch->getName();
         $rq_id = 'RQ'.$releeph_request->getID();
 
         if (idx($rqs_seen, $rq_id)) {
           throw new DifferentialFieldParseException(
             "Commit message refers to {$rq_id} multiple times!");
         }
         $rqs_seen[$rq_id] = true;
 
         if (!isset($groups[$branch_name])) {
           $groups[$branch_name] = array();
         }
         $groups[$branch_name][] = $rq_id;
       }
 
       if (count($groups) > 1) {
         $lists = array();
         foreach ($groups as $branch_name => $rq_ids) {
           $lists[] = implode(', ', $rq_ids).' in '.$branch_name;
         }
         throw new DifferentialFieldParseException(
           'Commit message references multiple Releeph requests, '.
           'but the requests are in different branches: '.
           implode('; ', $lists));
       }
     }
 
     $phids = mpull($releeph_requests, 'getPHID');
 
     $data = array(
       'releephAction' => $action,
       'releephPHIDs'  => $phids,
     );
     return $data;
   }
 
   public function renderLabelForCommitMessage() {
     return 'Releeph';
   }
 
   public function shouldAppearOnCommitMessageTemplate() {
     return false;
   }
 
   public function didParseCommit(PhabricatorRepository $repo,
                                  PhabricatorRepositoryCommit $commit,
                                  PhabricatorRepositoryCommitData $data) {
 
     // NOTE: This is currently dead code. See T2222.
 
     $releeph_requests = $this->loadReleephRequests();
 
     if (!$releeph_requests) {
       return;
     }
 
     $releeph_branch = head($releeph_requests)->getBranch();
     if (!$this->isCommitOnBranch($repo, $commit, $releeph_branch)) {
       return;
     }
 
     foreach ($releeph_requests as $releeph_request) {
       if ($this->releephAction === self::ACTION_PICKS) {
         $action = 'pick';
       } else {
         $action = 'revert';
       }
 
       $actor_phid = coalesce(
         $data->getCommitDetail('committerPHID'),
         $data->getCommitDetail('authorPHID'));
 
       $actor = id(new PhabricatorUser())
         ->loadOneWhere('phid = %s', $actor_phid);
 
       $xactions = array();
 
       $xactions[] = id(new ReleephRequestTransaction())
         ->setTransactionType(ReleephRequestTransaction::TYPE_DISCOVERY)
         ->setMetadataValue('action', $action)
         ->setMetadataValue('authorPHID',
           $data->getCommitDetail('authorPHID'))
         ->setMetadataValue('committerPHID',
           $data->getCommitDetail('committerPHID'))
         ->setNewValue($commit->getPHID());
 
       $editor = id(new ReleephRequestTransactionalEditor())
         ->setActor($actor)
         ->setContinueOnNoEffect(true)
         ->setContentSource(
           PhabricatorContentSource::newForSource(
             PhabricatorContentSource::SOURCE_UNKNOWN,
             array()));
 
       $editor->applyTransactions($releeph_request, $xactions);
     }
   }
 
   private function loadReleephRequests() {
     if (!$this->releephPHIDs) {
       return array();
     }
 
     return id(new ReleephRequestQuery())
       ->setViewer($this->getViewer())
       ->withPHIDs($this->releephPHIDs)
       ->execute();
   }
 
   private function isCommitOnBranch(PhabricatorRepository $repo,
                                     PhabricatorRepositoryCommit $commit,
                                     ReleephBranch $releeph_branch) {
 
     switch ($repo->getVersionControlSystem()) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         list($output) = $repo->execxLocalCommand(
           'branch --all --no-color --contains %s',
           $commit->getCommitIdentifier());
 
         $remote_prefix = 'remotes/origin/';
         $branches = array();
         foreach (array_filter(explode("\n", $output)) as $line) {
           $tokens = explode(' ', $line);
           $ref = last($tokens);
           if (strncmp($ref, $remote_prefix, strlen($remote_prefix)) === 0) {
             $branch = substr($ref, strlen($remote_prefix));
             $branches[$branch] = $branch;
           }
         }
 
         return idx($branches, $releeph_branch->getName());
         break;
 
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
         $change_query = DiffusionPathChangeQuery::newFromDiffusionRequest(
           DiffusionRequest::newFromDictionary(array(
             'user' => $this->getUser(),
             'repository' => $repo,
             'commit' => $commit->getCommitIdentifier(),
           )));
         $path_changes = $change_query->loadChanges();
         $commit_paths = mpull($path_changes, 'getPath');
 
         $branch_path = $releeph_branch->getName();
 
         $in_branch = array();
         $ex_branch = array();
         foreach ($commit_paths as $path) {
           if (strncmp($path, $branch_path, strlen($branch_path)) === 0) {
             $in_branch[] = $path;
           } else {
             $ex_branch[] = $path;
           }
         }
 
         if ($in_branch && $ex_branch) {
           $error = sprintf(
             'CONFUSION: commit %s in %s contains %d path change(s) that were '.
             'part of a Releeph branch, but also has %d path change(s) not '.
             'part of a Releeph branch!',
             $commit->getCommitIdentifier(),
             $repo->getCallsign(),
             count($in_branch),
             count($ex_branch));
           phlog($error);
         }
 
         return !empty($in_branch);
         break;
     }
   }
 
 }
diff --git a/src/applications/releeph/field/specification/ReleephFieldSpecification.php b/src/applications/releeph/field/specification/ReleephFieldSpecification.php
index 93e175a374..b0017f1b40 100644
--- a/src/applications/releeph/field/specification/ReleephFieldSpecification.php
+++ b/src/applications/releeph/field/specification/ReleephFieldSpecification.php
@@ -1,263 +1,263 @@
 <?php
 
 abstract class ReleephFieldSpecification
   extends PhabricatorCustomField
   implements PhabricatorMarkupInterface {
 
   // TODO: This is temporary, until ReleephFieldSpecification is more conformant
   // to PhabricatorCustomField.
   private $requestValue;
 
   public function readValueFromRequest(AphrontRequest $request) {
     $this->requestValue = $request->getStr($this->getRequiredStorageKey());
     return $this;
   }
 
   public function shouldAppearInPropertyView() {
     return true;
   }
 
   public function renderPropertyViewLabel() {
     return $this->getName();
   }
 
   public function renderPropertyViewValue(array $handles) {
     $key = $this->getRequiredStorageKey();
     $value = $this->getReleephRequest()->getDetail($key);
     if ($value === '') {
       return null;
     }
     return $value;
   }
 
   abstract public function getName();
 
 /* -(  Storage  )------------------------------------------------------------ */
 
   public function getStorageKey() {
     return null;
   }
 
   public function getRequiredStorageKey() {
     $key = $this->getStorageKey();
     if ($key === null) {
       throw new PhabricatorCustomFieldImplementationIncompleteException($this);
     }
     if (strpos($key, '.') !== false) {
       /**
        * Storage keys are reused for form controls, and periods in form control
        * names break HTML forms.
        */
       throw new Exception(
         "You can't use '.' in storage keys!");
     }
     return $key;
   }
 
   public function shouldAppearInEditView() {
     return $this->isEditable();
   }
 
   final public function isEditable() {
     return $this->getStorageKey() !== null;
   }
 
   final public function getValue() {
     if ($this->requestValue !== null) {
       return $this->requestValue;
     }
 
     $key = $this->getRequiredStorageKey();
     return $this->getReleephRequest()->getDetail($key);
   }
 
   final public function setValue($value) {
     $key = $this->getRequiredStorageKey();
     return $this->getReleephRequest()->setDetail($key, $value);
   }
 
   /**
    * @throws ReleephFieldParseException, to show an error.
    */
   public function validate($value) {
     return;
   }
 
   /**
    * Turn values as they are stored in a ReleephRequest into a text that can be
    * rendered as a transactions old/new values.
    */
   public function normalizeForTransactionView(
     PhabricatorApplicationTransaction $xaction,
     $value) {
 
     return $value;
   }
 
 
 /* -(  Conduit  )------------------------------------------------------------ */
 
   public function getKeyForConduit() {
     return $this->getRequiredStorageKey();
   }
 
   public function getValueForConduit() {
     return $this->getValue();
   }
 
   public function setValueFromConduitAPIRequest(ConduitAPIRequest $request) {
     $value = idx(
       $request->getValue('fields', array()),
       $this->getRequiredStorageKey());
     $this->validate($value);
     $this->setValue($value);
   }
 
 
 /* -(  Arcanist  )----------------------------------------------------------- */
 
   public function renderHelpForArcanist() {
     return '';
   }
 
 
 /* -(  Context  )------------------------------------------------------------ */
 
   private $releephProject;
   private $releephBranch;
   private $releephRequest;
   private $user;
 
   final public function setReleephProject(ReleephProject $rp) {
     $this->releephProject = $rp;
     return $this;
   }
 
   final public function setReleephBranch(ReleephBranch $rb) {
     $this->releephRequest = $rb;
     return $this;
   }
 
   final public function setReleephRequest(ReleephRequest $rr) {
     $this->releephRequest = $rr;
     return $this;
   }
 
   final public function setUser(PhabricatorUser $user) {
     $this->user = $user;
     return $this;
   }
 
   final public function getReleephProject() {
     if (!$this->releephProject) {
       return $this->getReleephBranch()->getProduct();
     }
     return $this->releephProject;
   }
 
   final public function getReleephBranch() {
     if (!$this->releephBranch) {
       return $this->getReleephRequest()->getBranch();
     }
     return $this->releephBranch;
   }
 
   final public function getReleephRequest() {
     if (!$this->releephRequest) {
       return $this->getObject();
     }
     return $this->releephRequest;
   }
 
   final public function getUser() {
     if (!$this->user) {
       return $this->getViewer();
     }
     return $this->user;
   }
 
 /* -(  Commit Messages  )---------------------------------------------------- */
 
   public function shouldAppearOnCommitMessage() {
     return false;
   }
 
   public function renderLabelForCommitMessage() {
     throw new PhabricatorCustomFieldImplementationIncompleteException($this);
   }
 
   public function renderValueForCommitMessage() {
     throw new PhabricatorCustomFieldImplementationIncompleteException($this);
   }
 
   public function shouldAppearOnRevertMessage() {
     return false;
   }
 
   public function renderLabelForRevertMessage() {
     return $this->renderLabelForCommitMessage();
   }
 
   public function renderValueForRevertMessage() {
     return $this->renderValueForCommitMessage();
   }
 
 
 /* -(  Markup Interface  )--------------------------------------------------- */
 
   const MARKUP_FIELD_GENERIC = 'releeph:generic-markup-field';
 
   private $engine;
 
   /**
-   * ReleephFieldSpecification implements much of PhabricatorMarkupInterface
-   * for you.  If you return true from `shouldMarkup()`, and implement
-   * `getMarkupText()` then your text will be rendered through the Phabricator
-   * markup pipeline.
+   * @{class:ReleephFieldSpecification} implements much of
+   * @{interface:PhabricatorMarkupInterface} for you. If you return true from
+   * `shouldMarkup()`, and implement `getMarkupText()` then your text will be
+   * rendered through the Phabricator markup pipeline.
    *
    * Output is retrievable with `getMarkupEngineOutput()`.
    */
   public function shouldMarkup() {
     return false;
   }
 
   public function getMarkupText($field) {
     throw new PhabricatorCustomFieldImplementationIncompleteException($this);
   }
 
   final public function getMarkupEngineOutput() {
     return $this->engine->getOutput($this, self::MARKUP_FIELD_GENERIC);
   }
 
   final public function setMarkupEngine(PhabricatorMarkupEngine $engine) {
     $this->engine = $engine;
     $engine->addObject($this, self::MARKUP_FIELD_GENERIC);
     return $this;
   }
 
   final public function getMarkupFieldKey($field) {
     return sprintf(
       '%s:%s:%s:%s',
       $this->getReleephRequest()->getPHID(),
       $this->getStorageKey(),
       $field,
       PhabricatorHash::digest($this->getMarkupText($field)));
   }
 
   final public function newMarkupEngine($field) {
     return PhabricatorMarkupEngine::newDifferentialMarkupEngine();
   }
 
   final public function didMarkupText(
     $field,
     $output,
     PhutilMarkupEngine $engine) {
 
     return $output;
   }
 
   final public function shouldUseMarkupCache($field) {
     return true;
   }
 
 }
diff --git a/src/applications/releeph/storage/ReleephBranch.php b/src/applications/releeph/storage/ReleephBranch.php
index d779af56a8..f3a2b3738c 100644
--- a/src/applications/releeph/storage/ReleephBranch.php
+++ b/src/applications/releeph/storage/ReleephBranch.php
@@ -1,154 +1,154 @@
 <?php
 
 final class ReleephBranch extends ReleephDAO
   implements PhabricatorPolicyInterface {
 
   protected $releephProjectID;
   protected $isActive;
   protected $createdByUserPHID;
 
   // The immutable name of this branch ('releases/foo-2013.01.24')
   protected $name;
   protected $basename;
 
   // The symbolic name of this branch (LATEST, PRODUCTION, RC, ...)
   // See SYMBOLIC_NAME_NOTE below
   protected $symbolicName;
 
   // Where to cut the branch
   protected $cutPointCommitPHID;
 
   protected $details = array();
 
   private $project = self::ATTACHABLE;
   private $cutPointCommit = self::ATTACHABLE;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
       self::CONFIG_SERIALIZATION => array(
         'details' => self::SERIALIZATION_JSON,
       ),
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(ReleephPHIDTypeBranch::TYPECONST);
   }
 
   public function getDetail($key, $default = null) {
     return idx($this->getDetails(), $key, $default);
   }
 
   public function setDetail($key, $value) {
     $this->details[$key] = $value;
     return $this;
   }
 
   public function willWriteData(array &$data) {
     // If symbolicName is omitted, set it to the basename.
     //
     // This means that we can enforce symbolicName as a UNIQUE column in the
-    // DB.  We'll interpret symbolicName === basename as meaning "no symbolic
+    // DB. We'll interpret symbolicName === basename as meaning "no symbolic
     // name".
     //
     // SYMBOLIC_NAME_NOTE
     if (!$data['symbolicName']) {
       $data['symbolicName'] = $data['basename'];
     }
     parent::willWriteData($data);
   }
 
   public function getSymbolicName() {
     // See SYMBOLIC_NAME_NOTE above for why this is needed
     if ($this->symbolicName == $this->getBasename()) {
       return '';
     }
     return $this->symbolicName;
   }
 
   public function setSymbolicName($name) {
     if ($name) {
       parent::setSymbolicName($name);
     } else {
       parent::setSymbolicName($this->getBasename());
     }
     return $this;
   }
 
   public function getDisplayName() {
     if ($sn = $this->getSymbolicName()) {
       return $sn;
     }
     return $this->getBasename();
   }
 
   public function getDisplayNameWithDetail() {
     $n = $this->getBasename();
     if ($sn = $this->getSymbolicName()) {
       return "{$sn} ({$n})";
     } else {
       return $n;
     }
   }
 
   public function getURI($path = null) {
     $components = array(
       '/releeph/branch',
       $this->getID(),
       $path,
     );
     return implode('/', $components);
   }
 
   public function isActive() {
     return $this->getIsActive();
   }
 
   public function attachProject(ReleephProject $project) {
     $this->project = $project;
     return $this;
   }
 
   public function getProject() {
     return $this->assertAttached($this->project);
   }
 
   public function getProduct() {
     return $this->getProject();
   }
 
   public function attachCutPointCommit(
     PhabricatorRepositoryCommit $commit = null) {
     $this->cutPointCommit = $commit;
     return $this;
   }
 
   public function getCutPointCommit() {
     return $this->assertAttached($this->cutPointCommit);
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return $this->getProduct()->getCapabilities();
   }
 
   public function getPolicy($capability) {
     return $this->getProduct()->getPolicy($capability);
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return $this->getProduct()->hasAutomaticCapability($capability, $viewer);
   }
 
   public function describeAutomaticCapability($capability) {
     return pht(
       'Release branches have the same policies as the product they are a '.
       'part of.');
   }
 
 
 }
diff --git a/src/applications/releeph/storage/ReleephProject.php b/src/applications/releeph/storage/ReleephProject.php
index 5735a49b87..612922eee1 100644
--- a/src/applications/releeph/storage/ReleephProject.php
+++ b/src/applications/releeph/storage/ReleephProject.php
@@ -1,135 +1,135 @@
 <?php
 
 final class ReleephProject extends ReleephDAO
   implements PhabricatorPolicyInterface {
 
   const DEFAULT_BRANCH_NAMESPACE = 'releeph-releases';
   const SYSTEM_AGENT_USERNAME_PREFIX = 'releeph-agent-';
 
   protected $name;
 
   // Specifying the place to pick from is a requirement for svn, though not
-  // for git.  It's always useful though for reasoning about what revs have
+  // for git. It's always useful though for reasoning about what revs have
   // been picked and which haven't.
   protected $trunkBranch;
 
   protected $repositoryPHID;
   protected $isActive;
   protected $createdByUserPHID;
   protected $arcanistProjectID;
 
   protected $details = array();
 
   private $repository = self::ATTACHABLE;
   private $arcanistProject = self::ATTACHABLE;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
       self::CONFIG_SERIALIZATION => array(
         'details' => self::SERIALIZATION_JSON,
       ),
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(ReleephPHIDTypeProduct::TYPECONST);
   }
 
   public function getDetail($key, $default = null) {
     return idx($this->details, $key, $default);
   }
 
   public function getURI($path = null) {
     $components = array(
       '/releeph/product',
       $this->getID(),
       $path
     );
     return implode('/', $components);
   }
 
   public function setDetail($key, $value) {
     $this->details[$key] = $value;
     return $this;
   }
 
   public function getArcanistProject() {
     return $this->assertAttached($this->arcanistProject);
   }
 
   public function attachArcanistProject(
     PhabricatorRepositoryArcanistProject $arcanist_project = null) {
     $this->arcanistProject = $arcanist_project;
     return $this;
   }
 
   public function getPushers() {
     return $this->getDetail('pushers', array());
   }
 
   public function isPusher(PhabricatorUser $user) {
     // TODO Deprecate this once `isPusher` is out of the Facebook codebase.
     return $this->isAuthoritative($user);
   }
 
   public function isAuthoritative(PhabricatorUser $user) {
     return $this->isAuthoritativePHID($user->getPHID());
   }
 
   public function isAuthoritativePHID($phid) {
     $pushers = $this->getPushers();
     if (!$pushers) {
       return true;
     } else {
       return in_array($phid, $pushers);
     }
   }
 
   public function attachRepository(PhabricatorRepository $repository) {
     $this->repository = $repository;
     return $this;
   }
 
   public function getRepository() {
     return $this->assertAttached($this->repository);
   }
 
   public function getReleephFieldSelector() {
     return new ReleephDefaultFieldSelector();
   }
 
   public function isTestFile($filename) {
     $test_paths = $this->getDetail('testPaths', array());
 
     foreach ($test_paths as $test_path) {
       if (preg_match($test_path, $filename)) {
         return true;
       }
     }
     return false;
   }
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
     );
   }
 
   public function getPolicy($capability) {
     return PhabricatorPolicies::POLICY_USER;
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return false;
   }
 
   public function describeAutomaticCapability($capability) {
     return null;
   }
 
 
 }
diff --git a/src/applications/releeph/storage/ReleephRequest.php b/src/applications/releeph/storage/ReleephRequest.php
index 07af37534b..56b201cf63 100644
--- a/src/applications/releeph/storage/ReleephRequest.php
+++ b/src/applications/releeph/storage/ReleephRequest.php
@@ -1,320 +1,320 @@
 <?php
 
 final class ReleephRequest extends ReleephDAO
   implements
     PhabricatorPolicyInterface,
     PhabricatorCustomFieldInterface {
 
   protected $branchID;
   protected $requestUserPHID;
   protected $details = array();
   protected $userIntents = array();
   protected $inBranch;
   protected $pickStatus;
   protected $mailKey;
 
   /**
    * The object which is being requested. Normally this is a commit, but it
    * might also be a revision. In the future, it could be a repository branch
    * or an external object (like a GitHub pull request).
    */
   protected $requestedObjectPHID;
 
   // Information about the thing being requested
   protected $requestCommitPHID;
 
   // Information about the last commit to the releeph branch
   protected $commitIdentifier;
   protected $commitPHID;
 
 
   private $customFields = self::ATTACHABLE;
   private $branch = self::ATTACHABLE;
   private $requestedObject = self::ATTACHABLE;
 
 
 /* -(  Constants and helper methods  )--------------------------------------- */
 
   const INTENT_WANT = 'want';
   const INTENT_PASS = 'pass';
 
   const PICK_PENDING  = 1; // old
   const PICK_FAILED   = 2;
   const PICK_OK       = 3;
   const PICK_MANUAL   = 4; // old
   const REVERT_OK     = 5;
   const REVERT_FAILED = 6;
 
   public function shouldBeInBranch() {
     return
       $this->getPusherIntent() == self::INTENT_WANT &&
       /**
        * We use "!= pass" instead of "== want" in case the requestor intent is
-       * not present.  In other words, only revert if the requestor explicitly
+       * not present. In other words, only revert if the requestor explicitly
        * passed.
        */
       $this->getRequestorIntent() != self::INTENT_PASS;
   }
 
   /**
    * Will return INTENT_WANT if any pusher wants this request, and no pusher
    * passes on this request.
    */
   public function getPusherIntent() {
     $product = $this->getBranch()->getProduct();
 
     if (!$product->getPushers()) {
       return self::INTENT_WANT;
     }
 
     $found_pusher_want = false;
     foreach ($this->userIntents as $phid => $intent) {
       if ($product->isAuthoritativePHID($phid)) {
         if ($intent == self::INTENT_PASS) {
           return self::INTENT_PASS;
         }
 
         $found_pusher_want = true;
       }
     }
 
     if ($found_pusher_want) {
       return self::INTENT_WANT;
     } else {
       return null;
     }
   }
 
   public function getRequestorIntent() {
     return idx($this->userIntents, $this->requestUserPHID);
   }
 
   public function getStatus() {
     return $this->calculateStatus();
   }
 
   public function getMonogram() {
     return 'Y'.$this->getID();
   }
 
   public function getBranch() {
     return $this->assertAttached($this->branch);
   }
 
   public function attachBranch(ReleephBranch $branch) {
     $this->branch = $branch;
     return $this;
   }
 
   public function getRequestedObject() {
     return $this->assertAttached($this->requestedObject);
   }
 
   public function attachRequestedObject($object) {
     $this->requestedObject = $object;
     return $this;
   }
 
   private function calculateStatus() {
     if ($this->shouldBeInBranch()) {
       if ($this->getInBranch()) {
         return ReleephRequestStatus::STATUS_PICKED;
       } else {
         return ReleephRequestStatus::STATUS_NEEDS_PICK;
       }
     } else {
       if ($this->getInBranch()) {
         return ReleephRequestStatus::STATUS_NEEDS_REVERT;
       } else {
         $has_been_in_branch = $this->getCommitIdentifier();
         // Regardless of why we reverted something, always say reverted if it
         // was once in the branch.
         if ($has_been_in_branch) {
           return ReleephRequestStatus::STATUS_REVERTED;
         } else if ($this->getPusherIntent() === ReleephRequest::INTENT_PASS) {
           // Otherwise, if it has never been in the branch, explicitly say why:
           return ReleephRequestStatus::STATUS_REJECTED;
         } else if ($this->getRequestorIntent() === ReleephRequest::INTENT_WANT) {
           return ReleephRequestStatus::STATUS_REQUESTED;
         } else {
           return ReleephRequestStatus::STATUS_ABANDONED;
         }
       }
     }
   }
 
 
 /* -(  Lisk mechanics  )----------------------------------------------------- */
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
       self::CONFIG_SERIALIZATION => array(
         'details' => self::SERIALIZATION_JSON,
         'userIntents' => self::SERIALIZATION_JSON,
       ),
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
       ReleephPHIDTypeRequest::TYPECONST);
   }
 
   public function save() {
     if (!$this->getMailKey()) {
       $this->setMailKey(Filesystem::readRandomCharacters(20));
     }
     return parent::save();
   }
 
 
 /* -(  Helpful accessors )--------------------------------------------------- */
 
 
   public function getDetail($key, $default = null) {
     return idx($this->getDetails(), $key, $default);
   }
 
   public function setDetail($key, $value) {
     $this->details[$key] = $value;
     return $this;
   }
 
 
   /**
    * Get the commit PHIDs this request is requesting.
    *
    * NOTE: For now, this always returns one PHID.
    *
    * @return list<phid> Commit PHIDs requested by this request.
    */
   public function getCommitPHIDs() {
     return array(
       $this->requestCommitPHID,
     );
   }
 
   public function getReason() {
     // Backward compatibility: reason used to be called comments
     $reason = $this->getDetail('reason');
     if (!$reason) {
       return $this->getDetail('comments');
     }
     return $reason;
   }
 
   /**
    * Allow a null summary, and fall back to the title of the commit.
    */
   public function getSummaryForDisplay() {
     $summary = $this->getDetail('summary');
 
     if (!strlen($summary)) {
       $commit = $this->loadPhabricatorRepositoryCommit();
       if ($commit) {
         $summary = $commit->getSummary();
       }
     }
 
     if (!strlen($summary)) {
       $summary = pht('None');
     }
 
     return $summary;
   }
 
 /* -(  Loading external objects  )------------------------------------------- */
 
   public function loadPhabricatorRepositoryCommit() {
     return $this->loadOneRelative(
       new PhabricatorRepositoryCommit(),
       'phid',
       'getRequestCommitPHID');
   }
 
   public function loadPhabricatorRepositoryCommitData() {
     $commit = $this->loadPhabricatorRepositoryCommit();
     if ($commit) {
       return $commit->loadOneRelative(
         new PhabricatorRepositoryCommitData(),
         'commitID');
     }
   }
 
 
 /* -(  State change helpers  )----------------------------------------------- */
 
   public function setUserIntent(PhabricatorUser $user, $intent) {
     $this->userIntents[$user->getPHID()] = $intent;
     return $this;
   }
 
 
 /* -(  Migrating to status-less ReleephRequests  )--------------------------- */
 
   protected function didReadData() {
     if ($this->userIntents === null) {
       $this->userIntents = array();
     }
   }
 
   public function setStatus($value) {
     throw new Exception('`status` is now deprecated!');
   }
 
 /* -(  Make magic Lisk methods private  )------------------------------------ */
 
   private function setUserIntents(array $ar) {
     return parent::setUserIntents($ar);
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
     );
   }
 
   public function getPolicy($capability) {
     return $this->getBranch()->getPolicy($capability);
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return $this->getBranch()->hasAutomaticCapability($capability, $viewer);
   }
 
   public function describeAutomaticCapability($capability) {
     return pht(
       'Pull requests have the same policies as the branches they are '.
       'requested against.');
   }
 
 
 
 /* -(  PhabricatorCustomFieldInterface  )------------------------------------ */
 
 
   public function getCustomFieldSpecificationForRole($role) {
     return PhabricatorEnv::getEnvConfig('releeph.fields');
   }
 
   public function getCustomFieldBaseClass() {
     return 'ReleephFieldSpecification';
   }
 
   public function getCustomFields() {
     return $this->assertAttached($this->customFields);
   }
 
   public function attachCustomFields(PhabricatorCustomFieldAttachment $fields) {
     $this->customFields = $fields;
     return $this;
   }
 
 
 }
diff --git a/src/applications/releeph/storage/ReleephRequestTransaction.php b/src/applications/releeph/storage/ReleephRequestTransaction.php
index 63cd215154..1df45416be 100644
--- a/src/applications/releeph/storage/ReleephRequestTransaction.php
+++ b/src/applications/releeph/storage/ReleephRequestTransaction.php
@@ -1,279 +1,279 @@
 <?php
 
 final class ReleephRequestTransaction
   extends PhabricatorApplicationTransaction {
 
   const TYPE_REQUEST          = 'releeph:request';
   const TYPE_USER_INTENT      = 'releeph:user_intent';
   const TYPE_EDIT_FIELD       = 'releeph:edit_field';
   const TYPE_PICK_STATUS      = 'releeph:pick_status';
   const TYPE_COMMIT           = 'releeph:commit';
   const TYPE_DISCOVERY        = 'releeph:discovery';
   const TYPE_MANUAL_IN_BRANCH = 'releeph:manual';
 
   public function getApplicationName() {
     return 'releeph';
   }
 
   public function getApplicationTransactionType() {
     return ReleephPHIDTypeRequest::TYPECONST;
   }
 
   public function getApplicationTransactionCommentObject() {
     return new ReleephRequestTransactionComment();
   }
 
   public function hasChangeDetails() {
     switch ($this->getTransactionType()) {
       default;
         break;
     }
     return parent::hasChangeDetails();
   }
 
   public function getRequiredHandlePHIDs() {
     $phids = parent::getRequiredHandlePHIDs();
     $phids[] = $this->getObjectPHID();
 
     $new = $this->getNewValue();
 
     switch ($this->getTransactionType()) {
       case ReleephRequestTransaction::TYPE_REQUEST:
       case ReleephRequestTransaction::TYPE_DISCOVERY:
         $phids[] = $new;
         break;
 
       case ReleephRequestTransaction::TYPE_EDIT_FIELD:
         self::searchForPHIDs($this->getOldValue(), $phids);
         self::searchForPHIDs($this->getNewValue(), $phids);
         break;
     }
 
     return $phids;
   }
 
   public function getTitle() {
     $author_phid = $this->getAuthorPHID();
     $object_phid = $this->getObjectPHID();
 
     $old = $this->getOldValue();
     $new = $this->getNewValue();
 
     switch ($this->getTransactionType()) {
       case ReleephRequestTransaction::TYPE_REQUEST:
         return pht(
           '%s requested %s',
           $this->renderHandleLink($author_phid),
           $this->renderHandleLink($new));
         break;
 
       case ReleephRequestTransaction::TYPE_USER_INTENT:
         return $this->getIntentTitle();
         break;
 
       case ReleephRequestTransaction::TYPE_EDIT_FIELD:
         $field = newv($this->getMetadataValue('fieldClass'), array());
         $name = $field->getName();
 
         $markup = $name;
         if ($this->getRenderingTarget() ===
           PhabricatorApplicationTransaction::TARGET_HTML) {
 
           $markup = hsprintf('<em>%s</em>', $name);
         }
 
         return pht(
           '%s changed the %s to "%s"',
           $this->renderHandleLink($author_phid),
           $markup,
           $field->normalizeForTransactionView($this, $new));
         break;
 
       case ReleephRequestTransaction::TYPE_PICK_STATUS:
         switch ($new) {
           case ReleephRequest::PICK_OK:
             return pht('%s found this request picks without error',
               $this->renderHandleLink($author_phid));
 
           case ReleephRequest::REVERT_OK:
             return pht('%s found this request reverts without error',
               $this->renderHandleLink($author_phid));
 
           case ReleephRequest::PICK_FAILED:
             return pht("%s couldn't pick this request",
               $this->renderHandleLink($author_phid));
 
           case ReleephRequest::REVERT_FAILED:
             return pht("%s couldn't revert this request",
               $this->renderHandleLink($author_phid));
         }
         break;
 
       case ReleephRequestTransaction::TYPE_COMMIT:
         $action_type = $this->getMetadataValue('action');
         switch ($action_type) {
           case 'pick':
             return pht(
               '%s picked this request and committed the result upstream',
               $this->renderHandleLink($author_phid));
             break;
 
           case 'revert':
             return pht(
               '%s reverted this request and committed the result upstream',
               $this->renderHandleLink($author_phid));
             break;
         }
         break;
 
       case ReleephRequestTransaction::TYPE_MANUAL_IN_BRANCH:
         $action = $new ? pht('picked') : pht('reverted');
         return pht(
           '%s marked this request as manually %s',
           $this->renderHandleLink($author_phid),
           $action);
         break;
 
       case ReleephRequestTransaction::TYPE_DISCOVERY:
         return pht('%s discovered this commit as %s',
           $this->renderHandleLink($author_phid),
           $this->renderHandleLink($new));
         break;
 
       default:
         return parent::getTitle();
         break;
     }
   }
 
   public function getActionStrength() {
     return parent::getActionStrength();
   }
 
   public function getActionName() {
     switch ($this->getTransactionType()) {
       case self::TYPE_REQUEST:
         return pht('Requested');
 
       case self::TYPE_COMMIT:
         $action_type = $this->getMetadataValue('action');
         switch ($action_type) {
           case 'pick':
             return pht('Picked');
 
           case 'revert':
             return pht('Reverted');
         }
     }
 
     return parent::getActionName();
   }
 
   public function getColor() {
     $new = $this->getNewValue();
 
     switch ($this->getTransactionType()) {
       case ReleephRequestTransaction::TYPE_USER_INTENT:
         switch ($new) {
           case ReleephRequest::INTENT_WANT:
             return PhabricatorTransactions::COLOR_GREEN;
           case ReleephRequest::INTENT_PASS:
             return PhabricatorTransactions::COLOR_RED;
         }
     }
     return parent::getColor();
   }
 
   private static function searchForPHIDs($thing, array &$phids) {
     /**
      * To implement something like getRequiredHandlePHIDs() in a
      * ReleephFieldSpecification, we'd have to provide the field with its
      * ReleephRequest (so that it could load the PHIDs from the
      * ReleephRequest's storage, and return them.)
      *
      * We don't have fields initialized with their ReleephRequests, but we can
      * make a good guess at what handles will be needed for rendering the field
      * in this transaction by inspecting the old and new values.
      */
     if (!is_array($thing)) {
       $thing = array($thing);
     }
 
     foreach ($thing as $value) {
       if (phid_get_type($value) !==
         PhabricatorPHIDConstants::PHID_TYPE_UNKNOWN) {
 
         $phids[] = $value;
       }
     }
   }
 
   private function getIntentTitle() {
     $author_phid = $this->getAuthorPHID();
     $object_phid = $this->getObjectPHID();
 
     $new = $this->getNewValue();
     $is_pusher = $this->getMetadataValue('isPusher');
 
     switch ($new) {
       case ReleephRequest::INTENT_WANT:
         if ($is_pusher) {
           return pht(
             '%s approved this request',
             $this->renderHandleLink($author_phid));
         } else {
           return pht(
             '%s wanted this request',
             $this->renderHandleLink($author_phid));
         }
 
       case ReleephRequest::INTENT_PASS:
         if ($is_pusher) {
           return pht(
             '%s rejected this request',
             $this->renderHandleLink($author_phid));
         } else {
           return pht(
             '%s passed on this request',
             $this->renderHandleLink($author_phid));
         }
     }
   }
 
   public function shouldHide() {
     $type = $this->getTransactionType();
 
     if ($type === ReleephRequestTransaction::TYPE_USER_INTENT &&
         $this->getMetadataValue('isRQCreate')) {
 
       return true;
     }
 
     if ($this->isBoringPickStatus()) {
       return true;
     }
 
     // ReleephSummaryFieldSpecification is usually blank when an RQ is created,
-    // creating a transaction change from null to "".  Hide these!
+    // creating a transaction change from null to "". Hide these!
     if ($type === ReleephRequestTransaction::TYPE_EDIT_FIELD) {
       if ($this->getOldValue() === null && $this->getNewValue() === '') {
         return true;
       }
     }
     return parent::shouldHide();
   }
 
   public function isBoringPickStatus() {
     $type = $this->getTransactionType();
     if ($type === ReleephRequestTransaction::TYPE_PICK_STATUS) {
       $new = $this->getNewValue();
       if ($new === ReleephRequest::PICK_OK ||
           $new === ReleephRequest::REVERT_OK) {
 
         return true;
       }
     }
     return false;
   }
 
 }
diff --git a/src/applications/repository/PhabricatorRepositoryConfigOptions.php b/src/applications/repository/PhabricatorRepositoryConfigOptions.php
index db362ea033..bbf70f40ca 100644
--- a/src/applications/repository/PhabricatorRepositoryConfigOptions.php
+++ b/src/applications/repository/PhabricatorRepositoryConfigOptions.php
@@ -1,32 +1,29 @@
 <?php
 
-/**
- * @group repository
- */
 final class PhabricatorRepositoryConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
     return pht('Repositories');
   }
 
   public function getDescription() {
     return pht('Configure repositories.');
   }
 
   public function getOptions() {
     return array(
       $this->newOption('repository.default-local-path', 'string', '/var/repo/')
         ->setLocked(true)
         ->setSummary(
           pht('Default location to store local copies of repositories.'))
         ->setDescription(
           pht(
             'The default location in which to store working copies and other '.
             'data about repositories. Phabricator will control and manage '.
             'data here, so you should **not** choose an existing directory '.
             'full of data you care about.')),
     );
   }
 
 }
diff --git a/src/applications/repository/application/PhabricatorApplicationRepositories.php b/src/applications/repository/application/PhabricatorApplicationRepositories.php
index 7f24630622..051da3660c 100644
--- a/src/applications/repository/application/PhabricatorApplicationRepositories.php
+++ b/src/applications/repository/application/PhabricatorApplicationRepositories.php
@@ -1,40 +1,37 @@
 <?php
 
-/**
- * @group repository
- */
 final class PhabricatorApplicationRepositories extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/repository/';
   }
 
   public function getIconName() {
     return 'repositories';
   }
 
   public function getShortDescription() {
     return pht('(Deprecated)');
   }
 
   public function getTitleGlyph() {
     return 'rX';
   }
 
   public function getApplicationGroup() {
     return self::GROUP_ADMIN;
   }
 
   public function getRoutes() {
     return array(
       '/repository/' => array(
         ''                     => 'PhabricatorRepositoryListController',
         'project/edit/(?P<id>[1-9]\d*)/' =>
           'PhabricatorRepositoryArcanistProjectEditController',
         'project/delete/(?P<id>[1-9]\d*)/' =>
           'PhabricatorRepositoryArcanistProjectDeleteController',
       ),
     );
   }
 
 }
diff --git a/src/applications/repository/conduit/ConduitAPI_repository_Method.php b/src/applications/repository/conduit/ConduitAPI_repository_Method.php
index 17f349ad8a..6dcf3eeb25 100644
--- a/src/applications/repository/conduit/ConduitAPI_repository_Method.php
+++ b/src/applications/repository/conduit/ConduitAPI_repository_Method.php
@@ -1,13 +1,10 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class ConduitAPI_repository_Method extends ConduitAPIMethod {
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
       'PhabricatorApplicationDiffusion');
   }
 
 }
diff --git a/src/applications/repository/conduit/ConduitAPI_repository_create_Method.php b/src/applications/repository/conduit/ConduitAPI_repository_create_Method.php
index 87dd64b8dc..4f08f68489 100644
--- a/src/applications/repository/conduit/ConduitAPI_repository_create_Method.php
+++ b/src/applications/repository/conduit/ConduitAPI_repository_create_Method.php
@@ -1,137 +1,133 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_repository_create_Method
   extends ConduitAPI_repository_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
   }
 
   public function getMethodStatusDescription() {
     return 'Repository methods are new and subject to change.';
   }
 
   public function getMethodDescription() {
     return 'Create a new repository (Admin Only).';
   }
 
   public function defineParamTypes() {
     $vcs_const = $this->formatStringConstants(array('git', 'hg', 'svn'));
 
     return array(
       'name'                => 'required string',
       'vcs'                 => 'required '.$vcs_const,
       'callsign'            => 'required string',
       'description'         => 'optional string',
       'encoding'            => 'optional string',
       'tracking'            => 'optional bool',
       'uri'                 => 'optional string',
       'credentialPHID'      => 'optional string',
       'svnSubpath'          => 'optional string',
       'branchFilter'        => 'optional list<string>',
       'closeCommitsFilter'  => 'optional list<string>',
       'pullFrequency'       => 'optional int',
       'defaultBranch'       => 'optional string',
       'heraldEnabled'       => 'optional bool, default = true',
       'autocloseEnabled'    => 'optional bool, default = true',
       'svnUUID'             => 'optional string',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR-PERMISSIONS' =>
         'You do not have the authority to call this method.',
       'ERR-DUPLICATE'   =>
         'Duplicate repository callsign.',
       'ERR-BAD-CALLSIGN' =>
         'Callsign is required and must be ALL UPPERCASE LETTERS.',
       'ERR-UNKNOWN-REPOSITORY-VCS' =>
         'Unknown repository VCS type.',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $application = id(new PhabricatorApplicationQuery())
       ->setViewer($request->getUser())
       ->withClasses(array('PhabricatorApplicationDiffusion'))
       ->executeOne();
 
     PhabricatorPolicyFilter::requireCapability(
       $request->getUser(),
       $application,
       DiffusionCapabilityCreateRepositories::CAPABILITY);
 
     // TODO: This has some duplication with (and lacks some of the validation
     // of) the web workflow; refactor things so they can share more code as this
     // stabilizes. Specifically, this should move to transactions since they
     // work properly now.
 
     $repository = PhabricatorRepository::initializeNewRepository(
       $request->getUser());
 
     $repository->setName($request->getValue('name'));
 
     $callsign = $request->getValue('callsign');
     if (!preg_match('/^[A-Z]+\z/', $callsign)) {
       throw new ConduitException('ERR-BAD-CALLSIGN');
     }
     $repository->setCallsign($callsign);
 
     $vcs = $request->getValue('vcs');
 
     $map = array(
       'git' => PhabricatorRepositoryType::REPOSITORY_TYPE_GIT,
       'hg'  => PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL,
       'svn' => PhabricatorRepositoryType::REPOSITORY_TYPE_SVN,
     );
     if (empty($map[$vcs])) {
       throw new ConduitException('ERR-UNKNOWN-REPOSITORY-VCS');
     }
     $repository->setVersionControlSystem($map[$vcs]);
 
     $repository->setCredentialPHID($request->getValue('credentialPHID'));
 
     $remote_uri = $request->getValue('uri');
     PhabricatorRepository::assertValidRemoteURI($remote_uri);
 
     $details = array(
       'encoding'          => $request->getValue('encoding'),
       'description'       => $request->getValue('description'),
       'tracking-enabled'  => (bool)$request->getValue('tracking', true),
       'remote-uri'        => $remote_uri,
       'branch-filter'     => array_fill_keys(
         $request->getValue('branchFilter', array()),
         true),
       'close-commits-filter' => array_fill_keys(
         $request->getValue('closeCommitsFilter', array()),
         true),
       'pull-frequency'    => $request->getValue('pullFrequency'),
       'default-branch'    => $request->getValue('defaultBranch'),
       'herald-disabled'   => !$request->getValue('heraldEnabled', true),
       'svn-subpath'       => $request->getValue('svnSubpath'),
       'disable-autoclose' => !$request->getValue('autocloseEnabled', true),
     );
 
     foreach ($details as $key => $value) {
       $repository->setDetail($key, $value);
     }
 
     try {
       $repository->save();
     } catch (AphrontQueryDuplicateKeyException $ex) {
       throw new ConduitException('ERR-DUPLICATE');
     }
 
     return $repository->toDictionary();
   }
 
-
 }
diff --git a/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeArcanistProject.php b/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeArcanistProject.php
index e66191fc96..e42ae18460 100644
--- a/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeArcanistProject.php
+++ b/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeArcanistProject.php
@@ -1,42 +1,39 @@
 <?php
 
-/**
- * @group repository
- */
 final class PhabricatorRepositoryPHIDTypeArcanistProject
   extends PhabricatorPHIDType {
 
   const TYPECONST = 'APRJ';
 
   public function getTypeConstant() {
     return self::TYPECONST;
   }
 
   public function getTypeName() {
     return pht('Arcanist Project');
   }
 
   public function newObject() {
     return new PhabricatorRepositoryArcanistProject();
   }
 
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorRepositoryArcanistProjectQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $project = $objects[$phid];
       $handle->setName($project->getName());
     }
   }
 
 }
diff --git a/src/applications/repository/query/PhabricatorRepositoryArcanistProjectQuery.php b/src/applications/repository/query/PhabricatorRepositoryArcanistProjectQuery.php
index 13f4cf1820..afed928c14 100644
--- a/src/applications/repository/query/PhabricatorRepositoryArcanistProjectQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryArcanistProjectQuery.php
@@ -1,90 +1,87 @@
 <?php
 
-/**
- * @group repository
- */
 final class PhabricatorRepositoryArcanistProjectQuery
   extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $ids;
   private $phids;
 
   private $needRepositories;
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
     return $this;
   }
 
   public function withPHIDs(array $phids) {
     $this->phids = $phids;
     return $this;
   }
 
   public function needRepositories($need_repositories) {
     $this->needRepositories = $need_repositories;
     return $this;
   }
 
   protected function loadPage() {
     $table = new PhabricatorRepositoryArcanistProject();
     $conn_r = $table->establishConnection('r');
 
     $data = queryfx_all(
       $conn_r,
       'SELECT * FROM %T %Q %Q %Q',
       $table->getTableName(),
       $this->buildWhereClause($conn_r),
       $this->buildOrderClause($conn_r),
       $this->buildLimitClause($conn_r));
 
     return $table->loadAllFromArray($data);
   }
 
   public function willFilterPage(array $projects) {
     assert_instances_of($projects, 'PhabricatorRepositoryArcanistProject');
 
     if ($this->needRepositories) {
       $repository_ids = mpull($projects, 'getRepositoryID');
       $repositories = id(new PhabricatorRepositoryQuery())
         ->setViewer($this->getViewer())
         ->withIDs($repository_ids)
         ->execute();
       foreach ($projects as $project) {
         $repo = idx($repositories, $project->getRepositoryID());
         $project->attachRepository($repo);
       }
     }
 
     return $projects;
   }
 
   private function buildWhereClause(AphrontDatabaseConnection $conn_r) {
     $where = array();
 
     if ($this->ids) {
       $where[] = qsprintf(
         $conn_r,
         'id IN (%Ld)',
         $this->ids);
     }
 
     if ($this->phids) {
       $where[] = qsprintf(
         $conn_r,
         'phid IN (%Ls)',
         $this->phids);
     }
 
     $where[] = $this->buildPagingClause($conn_r);
 
     return $this->formatWhereClause($where);
   }
 
 
   public function getQueryApplicationClass() {
     // TODO: Diffusion? Differential?
     return null;
   }
 
 }
diff --git a/src/applications/repository/storage/PhabricatorRepositoryArcanistProject.php b/src/applications/repository/storage/PhabricatorRepositoryArcanistProject.php
index aca35ff3ab..2d3b33366b 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryArcanistProject.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryArcanistProject.php
@@ -1,105 +1,102 @@
 <?php
 
-/**
- * @group repository
- */
 final class PhabricatorRepositoryArcanistProject
   extends PhabricatorRepositoryDAO
   implements PhabricatorPolicyInterface,
   PhabricatorDestructableInterface {
 
   protected $name;
   protected $repositoryID;
 
   protected $symbolIndexLanguages = array();
   protected $symbolIndexProjects  = array();
 
   private $repository = self::ATTACHABLE;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID   => true,
       self::CONFIG_TIMESTAMPS => false,
       self::CONFIG_SERIALIZATION => array(
         'symbolIndexLanguages' => self::SERIALIZATION_JSON,
         'symbolIndexProjects'  => self::SERIALIZATION_JSON,
       ),
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
       PhabricatorRepositoryPHIDTypeArcanistProject::TYPECONST);
   }
 
   // TODO: Remove. Also, T603.
   public function loadRepository() {
     if (!$this->getRepositoryID()) {
       return null;
     }
     return id(new PhabricatorRepository())->load($this->getRepositoryID());
   }
 
   public function delete() {
     $this->openTransaction();
 
       queryfx(
         $this->establishConnection('w'),
         'DELETE FROM %T WHERE arcanistProjectID = %d',
         id(new PhabricatorRepositorySymbol())->getTableName(),
         $this->getID());
 
       $result = parent::delete();
     $this->saveTransaction();
     return $result;
   }
 
   public function getRepository() {
     return $this->assertAttached($this->repository);
   }
 
   public function attachRepository(PhabricatorRepository $repository = null) {
     $this->repository = $repository;
     return $this;
   }
 
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
     );
   }
 
   public function getPolicy($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         return PhabricatorPolicies::POLICY_USER;
       case PhabricatorPolicyCapability::CAN_EDIT:
         return PhabricatorPolicies::POLICY_ADMIN;
     }
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return false;
   }
 
   public function describeAutomaticCapability($capability) {
     return null;
   }
 
 
 /* -(  PhabricatorDestructableInterface  )----------------------------------- */
 
   public function destroyObjectPermanently(
     PhabricatorDestructionEngine $engine) {
 
     $this->openTransaction();
     $this->delete();
     $this->saveTransaction();
   }
 
 }
diff --git a/src/applications/repository/storage/PhabricatorRepositorySymbol.php b/src/applications/repository/storage/PhabricatorRepositorySymbol.php
index 08e00bf687..9adde51cc9 100644
--- a/src/applications/repository/storage/PhabricatorRepositorySymbol.php
+++ b/src/applications/repository/storage/PhabricatorRepositorySymbol.php
@@ -1,80 +1,78 @@
 <?php
 
 /**
  * Records information about symbol locations in a codebase, like where classes
  * and functions are defined.
  *
  * Query symbols with @{class:DiffusionSymbolQuery}.
- *
- * @group diffusion
  */
 final class PhabricatorRepositorySymbol extends PhabricatorRepositoryDAO {
 
   protected $arcanistProjectID;
   protected $symbolContext;
   protected $symbolName;
   protected $symbolType;
   protected $symbolLanguage;
   protected $pathID;
   protected $lineNumber;
 
   private $path = self::ATTACHABLE;
   private $arcanistProject = self::ATTACHABLE;
   private $repository = self::ATTACHABLE;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_IDS => self::IDS_MANUAL,
       self::CONFIG_TIMESTAMPS => false,
     ) + parent::getConfiguration();
   }
 
   public function getURI() {
     if (!$this->repository) {
       // This symbol is in the index, but we don't know which Repository it's
       // part of. Usually this means the Arcanist Project hasn't been linked
       // to a Repository. We can't generate a URI, so just fail.
       return null;
     }
 
     $request = DiffusionRequest::newFromDictionary(
       array(
         'user' => PhabricatorUser::getOmnipotentUser(),
         'repository' => $this->getRepository(),
       ));
     return $request->generateURI(
       array(
         'action'    => 'browse',
         'path'      => $this->getPath(),
         'line'      => $this->getLineNumber(),
       ));
   }
 
   public function getPath() {
     return $this->assertAttached($this->path);
   }
 
   public function attachPath($path) {
     $this->path = $path;
     return $this;
   }
 
   public function getRepository() {
     return $this->assertAttached($this->repository);
   }
 
   public function attachRepository($repository) {
     $this->repository = $repository;
     return $this;
   }
 
   public function getArcanistProject() {
     return $this->assertAttached($this->arcanistProject);
   }
 
   public function attachArcanistProject($project) {
     $this->arcanistProject = $project;
     return $this;
   }
 
 }
diff --git a/src/applications/search/constants/PhabricatorSearchField.php b/src/applications/search/constants/PhabricatorSearchField.php
index 24d28b6769..c578cdf109 100644
--- a/src/applications/search/constants/PhabricatorSearchField.php
+++ b/src/applications/search/constants/PhabricatorSearchField.php
@@ -1,12 +1,9 @@
 <?php
 
-/**
- * @group search
- */
 final class PhabricatorSearchField {
 
   const FIELD_TITLE         = 'titl';
   const FIELD_BODY          = 'body';
   const FIELD_COMMENT       = 'cmnt';
 
 }
diff --git a/src/applications/search/constants/PhabricatorSearchRelationship.php b/src/applications/search/constants/PhabricatorSearchRelationship.php
index 62c021b1bd..cde5f6539d 100644
--- a/src/applications/search/constants/PhabricatorSearchRelationship.php
+++ b/src/applications/search/constants/PhabricatorSearchRelationship.php
@@ -1,20 +1,17 @@
 <?php
 
-/**
- * @group search
- */
 final class PhabricatorSearchRelationship {
 
   const RELATIONSHIP_AUTHOR     = 'auth';
   const RELATIONSHIP_REVIEWER   = 'revw';
   const RELATIONSHIP_SUBSCRIBER = 'subs';
   const RELATIONSHIP_COMMENTER  = 'comm';
   const RELATIONSHIP_OWNER      = 'ownr';
   const RELATIONSHIP_PROJECT    = 'proj';
   const RELATIONSHIP_REPOSITORY = 'repo';
 
   const RELATIONSHIP_OPEN       = 'open';
   const RELATIONSHIP_CLOSED     = 'clos';
   const RELATIONSHIP_UNOWNED    = 'unow';
 
 }
diff --git a/src/applications/search/controller/PhabricatorSearchAttachController.php b/src/applications/search/controller/PhabricatorSearchAttachController.php
index 2c36ee49d8..a799aa7b67 100644
--- a/src/applications/search/controller/PhabricatorSearchAttachController.php
+++ b/src/applications/search/controller/PhabricatorSearchAttachController.php
@@ -1,347 +1,344 @@
 <?php
 
-/**
- * @group search
- */
 final class PhabricatorSearchAttachController
   extends PhabricatorSearchBaseController {
 
   private $phid;
   private $type;
   private $action;
 
   const ACTION_ATTACH       = 'attach';
   const ACTION_MERGE        = 'merge';
   const ACTION_DEPENDENCIES = 'dependencies';
   const ACTION_BLOCKS       = 'blocks';
   const ACTION_EDGE         = 'edge';
 
   public function willProcessRequest(array $data) {
     $this->phid = $data['phid'];
     $this->type = $data['type'];
     $this->action = idx($data, 'action', self::ACTION_ATTACH);
   }
 
   public function processRequest() {
 
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $handle = id(new PhabricatorHandleQuery())
       ->setViewer($user)
       ->withPHIDs(array($this->phid))
       ->executeOne();
 
     $object_type = $handle->getType();
     $attach_type = $this->type;
 
     $object = id(new PhabricatorObjectQuery())
       ->setViewer($user)
       ->withPHIDs(array($this->phid))
       ->executeOne();
 
     if (!$object) {
       return new Aphront404Response();
     }
 
     $edge_type = null;
     switch ($this->action) {
       case self::ACTION_EDGE:
       case self::ACTION_DEPENDENCIES:
       case self::ACTION_BLOCKS:
       case self::ACTION_ATTACH:
         $edge_type = $this->getEdgeType($object_type, $attach_type);
         break;
     }
 
     if ($request->isFormPost()) {
       $phids = explode(';', $request->getStr('phids'));
       $phids = array_filter($phids);
       $phids = array_values($phids);
 
       if ($edge_type) {
         $do_txn = $object instanceof PhabricatorApplicationTransactionInterface;
         $old_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
           $this->phid,
           $edge_type);
         $add_phids = $phids;
         $rem_phids = array_diff($old_phids, $add_phids);
 
         if ($do_txn) {
 
           $txn_editor = $object->getApplicationTransactionEditor()
             ->setActor($user)
             ->setContentSourceFromRequest($request);
           $txn_template = $object->getApplicationTransactionTemplate()
             ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
             ->setMetadataValue('edge:type', $edge_type)
             ->setNewValue(array(
               '+' => array_fuse($add_phids),
               '-' => array_fuse($rem_phids)));
           $txn_editor->applyTransactions(
             $object->getApplicationTransactionObject(),
             array($txn_template));
 
         } else {
 
           $editor = id(new PhabricatorEdgeEditor());
           $editor->setActor($user);
           foreach ($add_phids as $phid) {
             $editor->addEdge($this->phid, $edge_type, $phid);
           }
           foreach ($rem_phids as $phid) {
             $editor->removeEdge($this->phid, $edge_type, $phid);
           }
 
           try {
             $editor->save();
           } catch (PhabricatorEdgeCycleException $ex) {
             $this->raiseGraphCycleException($ex);
           }
         }
 
         return id(new AphrontReloadResponse())->setURI($handle->getURI());
       } else {
         return $this->performMerge($object, $handle, $phids);
       }
     } else {
       if ($edge_type) {
         $phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
           $this->phid,
           $edge_type);
       } else {
         // This is a merge.
         $phids = array();
       }
     }
 
     $strings = $this->getStrings();
 
     $handles = $this->loadViewerHandles($phids);
 
     $obj_dialog = new PhabricatorObjectSelectorDialog();
     $obj_dialog
       ->setUser($user)
       ->setHandles($handles)
       ->setFilters($this->getFilters($strings))
       ->setSelectedFilter($strings['selected'])
       ->setExcluded($this->phid)
       ->setCancelURI($handle->getURI())
       ->setSearchURI('/search/select/'.$attach_type.'/')
       ->setTitle($strings['title'])
       ->setHeader($strings['header'])
       ->setButtonText($strings['button'])
       ->setInstructions($strings['instructions']);
 
     $dialog = $obj_dialog->buildDialog();
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
   private function performMerge(
     ManiphestTask $task,
     PhabricatorObjectHandle $handle,
     array $phids) {
 
     $user = $this->getRequest()->getUser();
     $response = id(new AphrontReloadResponse())->setURI($handle->getURI());
 
     $phids = array_fill_keys($phids, true);
     unset($phids[$task->getPHID()]); // Prevent merging a task into itself.
 
     if (!$phids) {
       return $response;
     }
 
     $targets = id(new ManiphestTaskQuery())
       ->setViewer($user)
       ->withPHIDs(array_keys($phids))
       ->execute();
 
     if (empty($targets)) {
       return $response;
     }
 
     $editor = id(new ManiphestTransactionEditor())
       ->setActor($user)
       ->setContentSourceFromRequest($this->getRequest())
       ->setContinueOnNoEffect(true)
       ->setContinueOnMissingFields(true);
 
     $task_names = array();
 
     $merge_into_name = 'T'.$task->getID();
 
     $cc_vector = array();
     $cc_vector[] = $task->getCCPHIDs();
     foreach ($targets as $target) {
       $cc_vector[] = $target->getCCPHIDs();
       $cc_vector[] = array(
         $target->getAuthorPHID(),
         $target->getOwnerPHID());
 
       $close_task = id(new ManiphestTransaction())
         ->setTransactionType(ManiphestTransaction::TYPE_STATUS)
         ->setNewValue(ManiphestTaskStatus::getDuplicateStatus());
 
       $merge_comment = id(new ManiphestTransaction())
         ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
         ->attachComment(
           id(new ManiphestTransactionComment())
             ->setContent("\xE2\x9C\x98 Merged into {$merge_into_name}."));
 
       $editor->applyTransactions(
         $target,
         array(
           $close_task,
           $merge_comment,
         ));
 
       $task_names[] = 'T'.$target->getID();
     }
     $all_ccs = array_mergev($cc_vector);
     $all_ccs = array_filter($all_ccs);
     $all_ccs = array_unique($all_ccs);
 
     $task_names = implode(', ', $task_names);
 
     $add_ccs = id(new ManiphestTransaction())
       ->setTransactionType(ManiphestTransaction::TYPE_CCS)
       ->setNewValue($all_ccs);
 
     $merged_comment = id(new ManiphestTransaction())
       ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
       ->attachComment(
         id(new ManiphestTransactionComment())
           ->setContent("\xE2\x97\x80 Merged tasks: {$task_names}."));
 
     $editor->applyTransactions($task, array($add_ccs, $merged_comment));
 
     return $response;
   }
 
   private function getStrings() {
     switch ($this->type) {
       case DifferentialPHIDTypeRevision::TYPECONST:
         $noun = 'Revisions';
         $selected = 'created';
         break;
       case ManiphestPHIDTypeTask::TYPECONST:
         $noun = 'Tasks';
         $selected = 'assigned';
         break;
       case PhabricatorRepositoryPHIDTypeCommit::TYPECONST:
         $noun = 'Commits';
         $selected = 'created';
         break;
       case PholioPHIDTypeMock::TYPECONST:
         $noun = 'Mocks';
         $selected = 'created';
         break;
     }
 
     switch ($this->action) {
       case self::ACTION_EDGE:
       case self::ACTION_ATTACH:
         $dialog_title = "Manage Attached {$noun}";
         $header_text = "Currently Attached {$noun}";
         $button_text = "Save {$noun}";
         $instructions = null;
         break;
       case self::ACTION_MERGE:
         $dialog_title = 'Merge Duplicate Tasks';
         $header_text = 'Tasks To Merge';
         $button_text = "Merge {$noun}";
         $instructions =
           'These tasks will be merged into the current task and then closed. '.
           'The current task will grow stronger.';
         break;
       case self::ACTION_DEPENDENCIES:
         $dialog_title = 'Edit Dependencies';
         $header_text = 'Current Dependencies';
         $button_text = 'Save Dependencies';
         $instructions = null;
         break;
       case self::ACTION_BLOCKS:
         $dialog_title = pht('Edit Blocking Tasks');
         $header_text = pht('Current Blocking Tasks');
         $button_text = pht('Save Blocking Tasks');
         $instructions = null;
         break;
     }
 
     return array(
       'target_plural_noun'    => $noun,
       'selected'              => $selected,
       'title'                 => $dialog_title,
       'header'                => $header_text,
       'button'                => $button_text,
       'instructions'          => $instructions,
     );
   }
 
   private function getFilters(array $strings) {
     if ($this->type == PholioPHIDTypeMock::TYPECONST) {
       $filters = array(
         'created' => 'Created By Me',
         'all' => 'All '.$strings['target_plural_noun'],
       );
     } else {
       $filters = array(
         'assigned' => 'Assigned to Me',
         'created' => 'Created By Me',
         'open' => 'All Open '.$strings['target_plural_noun'],
         'all' => 'All '.$strings['target_plural_noun'],
       );
     }
 
     return $filters;
   }
 
   private function getEdgeType($src_type, $dst_type) {
     $t_cmit = PhabricatorRepositoryPHIDTypeCommit::TYPECONST;
     $t_task = ManiphestPHIDTypeTask::TYPECONST;
     $t_drev = DifferentialPHIDTypeRevision::TYPECONST;
     $t_mock = PholioPHIDTypeMock::TYPECONST;
 
     $map = array(
       $t_cmit => array(
         $t_task => PhabricatorEdgeConfig::TYPE_COMMIT_HAS_TASK,
       ),
       $t_task => array(
         $t_cmit => PhabricatorEdgeConfig::TYPE_TASK_HAS_COMMIT,
         $t_task => PhabricatorEdgeConfig::TYPE_TASK_DEPENDS_ON_TASK,
         $t_drev => PhabricatorEdgeConfig::TYPE_TASK_HAS_RELATED_DREV,
         $t_mock => PhabricatorEdgeConfig::TYPE_TASK_HAS_MOCK,
       ),
       $t_drev => array(
         $t_drev => PhabricatorEdgeConfig::TYPE_DREV_DEPENDS_ON_DREV,
         $t_task => PhabricatorEdgeConfig::TYPE_DREV_HAS_RELATED_TASK,
       ),
       $t_mock => array(
         $t_task => PhabricatorEdgeConfig::TYPE_MOCK_HAS_TASK,
       ),
     );
 
     if (empty($map[$src_type][$dst_type])) {
       return null;
     }
 
     return $map[$src_type][$dst_type];
   }
 
   private function raiseGraphCycleException(PhabricatorEdgeCycleException $ex) {
     $cycle = $ex->getCycle();
 
     $handles = $this->loadViewerHandles($cycle);
     $names = array();
     foreach ($cycle as $cycle_phid) {
       $names[] = $handles[$cycle_phid]->getFullName();
     }
     $names = implode(" \xE2\x86\x92 ", $names);
     throw new Exception(
       "You can not create that dependency, because it would create a ".
       "circular dependency: {$names}.");
   }
 
 }
diff --git a/src/applications/search/controller/PhabricatorSearchBaseController.php b/src/applications/search/controller/PhabricatorSearchBaseController.php
index f045357a66..446406dfea 100644
--- a/src/applications/search/controller/PhabricatorSearchBaseController.php
+++ b/src/applications/search/controller/PhabricatorSearchBaseController.php
@@ -1,21 +1,18 @@
 <?php
 
-/**
- * @group search
- */
 abstract class PhabricatorSearchBaseController extends PhabricatorController {
 
   public function buildStandardPageResponse($view, array $data) {
     $page = $this->buildStandardPageView();
 
     $page->setApplicationName('Search');
     $page->setBaseURI('/search/');
     $page->setTitle(idx($data, 'title'));
     $page->setGlyph("\xC2\xBF");
     $page->appendChild($view);
 
     $response = new AphrontWebpageResponse();
     return $response->setContent($page->render());
   }
 
 }
diff --git a/src/applications/search/controller/PhabricatorSearchDeleteController.php b/src/applications/search/controller/PhabricatorSearchDeleteController.php
index 2cd7e8845c..d743fb39ba 100644
--- a/src/applications/search/controller/PhabricatorSearchDeleteController.php
+++ b/src/applications/search/controller/PhabricatorSearchDeleteController.php
@@ -1,99 +1,96 @@
 <?php
 
-/**
- * @group search
- */
 final class PhabricatorSearchDeleteController
   extends PhabricatorSearchBaseController {
 
   private $queryKey;
   private $engineClass;
 
   public function willProcessRequest(array $data) {
     $this->queryKey = idx($data, 'queryKey');
     $this->engineClass = idx($data, 'engine');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $key = $this->queryKey;
 
     $base_class = 'PhabricatorApplicationSearchEngine';
     if (!is_subclass_of($this->engineClass, $base_class)) {
       return new Aphront400Response();
     }
 
     $engine = newv($this->engineClass, array());
     $engine->setViewer($user);
 
     $named_query = id(new PhabricatorNamedQueryQuery())
       ->setViewer($user)
       ->withEngineClassNames(array($this->engineClass))
       ->withQueryKeys(array($key))
       ->withUserPHIDs(array($user->getPHID()))
       ->executeOne();
 
     if (!$named_query && $engine->isBuiltinQuery($key)) {
       $named_query = $engine->getBuiltinQuery($key);
     }
 
     if (!$named_query) {
       return new Aphront404Response();
     }
 
     $builtin = null;
     if ($engine->isBuiltinQuery($key)) {
       $builtin = $engine->getBuiltinQuery($key);
     }
 
     $return_uri = $engine->getQueryManagementURI();
 
     if ($request->isDialogFormPost()) {
       if ($named_query->getIsBuiltin()) {
         $named_query->setIsDisabled((int)(!$named_query->getIsDisabled()));
         $named_query->save();
       } else {
         $named_query->delete();
       }
 
       return id(new AphrontRedirectResponse())->setURI($return_uri);
     }
 
     if ($named_query->getIsBuiltin()) {
       if ($named_query->getIsDisabled()) {
         $title = pht('Enable Query?');
         $desc = pht(
           'Enable the built-in query "%s"? It will appear in your menu again.',
           $builtin->getQueryName());
         $button = pht('Enable Query');
       } else {
         $title = pht('Disable Query?');
         $desc = pht(
           'This built-in query can not be deleted, but you can disable it so '.
           'it does not appear in your query menu. You can enable it again '.
           'later. Disable built-in query "%s"?',
           $builtin->getQueryName());
         $button = pht('Disable Query');
       }
     } else {
       $title = pht('Really Delete Query?');
       $desc = pht(
         'Really delete the query "%s"? You can not undo this. Remember '.
         'all the great times you had filtering results together?',
         $named_query->getQueryName());
       $button = pht('Delete Query');
     }
 
     $dialog = id(new AphrontDialogView())
       ->setUser($user)
       ->setTitle($title)
       ->appendChild($desc)
       ->addCancelButton($return_uri)
       ->addSubmitButton($button);
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
 }
diff --git a/src/applications/search/controller/PhabricatorSearchEditController.php b/src/applications/search/controller/PhabricatorSearchEditController.php
index 29fac3b58b..3f089c5edf 100644
--- a/src/applications/search/controller/PhabricatorSearchEditController.php
+++ b/src/applications/search/controller/PhabricatorSearchEditController.php
@@ -1,109 +1,105 @@
 <?php
 
-/**
- * @group search
- */
 final class PhabricatorSearchEditController
   extends PhabricatorSearchBaseController {
 
   private $queryKey;
 
   public function willProcessRequest(array $data) {
     $this->queryKey = idx($data, 'queryKey');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $saved_query = id(new PhabricatorSavedQueryQuery())
       ->setViewer($user)
       ->withQueryKeys(array($this->queryKey))
       ->executeOne();
 
     if (!$saved_query) {
       return new Aphront404Response();
     }
 
     $engine = $saved_query->newEngine()->setViewer($user);
 
     $complete_uri = $engine->getQueryManagementURI();
     $cancel_uri = $complete_uri;
 
     $named_query = id(new PhabricatorNamedQueryQuery())
       ->setViewer($user)
       ->withQueryKeys(array($saved_query->getQueryKey()))
       ->withUserPHIDs(array($user->getPHID()))
       ->executeOne();
     if (!$named_query) {
       $named_query = id(new PhabricatorNamedQuery())
         ->setUserPHID($user->getPHID())
         ->setQueryKey($saved_query->getQueryKey())
         ->setEngineClassName($saved_query->getEngineClassName());
 
       // If we haven't saved the query yet, this is a "Save..." operation, so
       // take the user back to the query if they cancel instead of back to the
       // management interface.
       $cancel_uri = $engine->getQueryResultsPageURI(
         $saved_query->getQueryKey());
     }
 
     $e_name = true;
     $errors = array();
 
     if ($request->isFormPost()) {
       $named_query->setQueryName($request->getStr('name'));
       if (!strlen($named_query->getQueryName())) {
         $e_name = pht('Required');
         $errors[] = pht('You must name the query.');
       } else {
         $e_name = null;
       }
 
       if (!$errors) {
         $named_query->save();
         return id(new AphrontRedirectResponse())->setURI($complete_uri);
       }
     }
 
     $form = id(new AphrontFormView())
       ->setUser($user);
 
     $form->appendChild(
       id(new AphrontFormTextControl())
         ->setName('name')
         ->setLabel(pht('Query Name'))
         ->setValue($named_query->getQueryName())
         ->setError($e_name));
 
     $form->appendChild(
       id(new AphrontFormSubmitControl())
         ->setValue(pht('Save Query'))
         ->addCancelButton($cancel_uri));
 
     if ($named_query->getID()) {
       $title = pht('Edit Saved Query');
     } else {
       $title = pht('Save Query');
     }
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText($title)
       ->setFormErrors($errors)
       ->setForm($form);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($title);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $form_box,
       ),
       array(
         'title' => $title,
       ));
   }
 
-
 }
diff --git a/src/applications/search/controller/PhabricatorSearchHovercardController.php b/src/applications/search/controller/PhabricatorSearchHovercardController.php
index e2156a0eb1..237373c6c7 100644
--- a/src/applications/search/controller/PhabricatorSearchHovercardController.php
+++ b/src/applications/search/controller/PhabricatorSearchHovercardController.php
@@ -1,69 +1,66 @@
 <?php
 
-/**
- * @group search
- */
 final class PhabricatorSearchHovercardController
   extends PhabricatorSearchBaseController {
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $phids = $request->getArr('phids');
 
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($user)
       ->withPHIDs($phids)
       ->execute();
     $objects = id(new PhabricatorObjectQuery())
       ->setViewer($user)
       ->withPHIDs($phids)
       ->execute();
 
     $cards = array();
 
     foreach ($phids as $phid) {
       $handle = $handles[$phid];
 
       $hovercard = new PhabricatorHovercardView();
       $hovercard->setObjectHandle($handle);
 
       // Send it to the other side of the world, thanks to PhutilEventEngine
       $event = new PhabricatorEvent(
         PhabricatorEventType::TYPE_UI_DIDRENDERHOVERCARD,
         array(
           'hovercard' => $hovercard,
           'handle'    => $handle,
           'object'    => idx($objects, $phid),
         ));
       $event->setUser($user);
       PhutilEventEngine::dispatchEvent($event);
 
       $cards[$phid] = $hovercard;
     }
 
     // Browser-friendly for non-Ajax requests
     if (!$request->isAjax()) {
       foreach ($cards as $key => $hovercard) {
         $cards[$key] = phutil_tag('div',
           array(
             'class' => 'ml',
           ),
           $hovercard);
       }
 
       return $this->buildApplicationPage(
         $cards,
         array(
           'device' => false,
         ));
     } else {
       return id(new AphrontAjaxResponse())->setContent(
         array(
           'cards' => $cards,
         ));
     }
   }
 
 }
diff --git a/src/applications/search/controller/PhabricatorSearchOrderController.php b/src/applications/search/controller/PhabricatorSearchOrderController.php
index 7093aed162..244caf83b0 100644
--- a/src/applications/search/controller/PhabricatorSearchOrderController.php
+++ b/src/applications/search/controller/PhabricatorSearchOrderController.php
@@ -1,44 +1,41 @@
 <?php
 
-/**
- * @group search
- */
 final class PhabricatorSearchOrderController
   extends PhabricatorSearchBaseController {
 
   private $engineClass;
 
   public function willProcessRequest(array $data) {
     $this->engineClass = idx($data, 'engine');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $request->validateCSRF();
 
     $base_class = 'PhabricatorApplicationSearchEngine';
     if (!is_subclass_of($this->engineClass, $base_class)) {
       return new Aphront400Response();
     }
 
     $engine = newv($this->engineClass, array());
     $engine->setViewer($user);
 
     $queries = $engine->loadAllNamedQueries();
     $queries = mpull($queries, null, 'getQueryKey');
 
     $order = $request->getStrList('order');
     $queries = array_select_keys($queries, $order) + $queries;
 
     $sequence = 1;
     foreach ($queries as $query) {
       $query->setSequence($sequence++);
       $query->save();
     }
 
     return id(new AphrontAjaxResponse());
   }
 
 }
diff --git a/src/applications/search/controller/PhabricatorSearchSelectController.php b/src/applications/search/controller/PhabricatorSearchSelectController.php
index e9e62e0393..7c45682548 100644
--- a/src/applications/search/controller/PhabricatorSearchSelectController.php
+++ b/src/applications/search/controller/PhabricatorSearchSelectController.php
@@ -1,82 +1,79 @@
 <?php
 
-/**
- * @group search
- */
 final class PhabricatorSearchSelectController
   extends PhabricatorSearchBaseController {
 
   private $type;
 
   public function willProcessRequest(array $data) {
     $this->type = $data['type'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $query = new PhabricatorSavedQuery();
     $query_str = $request->getStr('query');
 
     $query->setEngineClassName('PhabricatorSearchApplicationSearchEngine');
     $query->setParameter('query', $query_str);
     $query->setParameter('types', array($this->type));
 
     $status_open = PhabricatorSearchRelationship::RELATIONSHIP_OPEN;
 
     switch ($request->getStr('filter')) {
       case 'assigned':
         $query->setParameter('ownerPHIDs', array($user->getPHID()));
         $query->setParameter('statuses', array($status_open));
         break;
       case 'created';
         $query->setParameter('authorPHIDs', array($user->getPHID()));
         // TODO - if / when we allow pholio mocks to be archived, etc
         // update this
         if ($this->type != PholioPHIDTypeMock::TYPECONST) {
           $query->setParameter('statuses', array($status_open));
         }
         break;
       case 'open':
         $query->setParameter('statuses', array($status_open));
         break;
     }
 
     $query->setParameter('excludePHIDs', array($request->getStr('exclude')));
 
     $results = id(new PhabricatorSearchDocumentQuery())
       ->setViewer($user)
       ->withSavedQuery($query)
       ->setOffset(0)
       ->setLimit(100)
       ->execute();
 
     $phids = array_fill_keys(mpull($results, 'getPHID'), true);
     $phids += $this->queryObjectNames($query_str);
 
     $phids = array_keys($phids);
     $handles = $this->loadViewerHandles($phids);
 
     $data = array();
     foreach ($handles as $handle) {
       $view = new PhabricatorHandleObjectSelectorDataView($handle);
       $data[] = $view->renderData();
     }
 
     return id(new AphrontAjaxResponse())->setContent($data);
   }
 
   private function queryObjectNames($query) {
     $viewer = $this->getRequest()->getUser();
 
     $objects = id(new PhabricatorObjectQuery())
       ->setViewer($viewer)
       ->withTypes(array($this->type))
       ->withNames(array($query))
       ->execute();
 
     return mpull($objects, 'getPHID');
   }
 
 }
diff --git a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
index 9dd2519ff0..c0015494ea 100644
--- a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
+++ b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
@@ -1,825 +1,823 @@
 <?php
 
 /**
  * Represents an abstract search engine for an application. It supports
  * creating and storing saved queries.
  *
  * @task construct  Constructing Engines
  * @task app        Applications
  * @task builtin    Builtin Queries
  * @task uri        Query URIs
  * @task dates      Date Filters
  * @task read       Reading Utilities
  * @task exec       Paging and Executing Queries
  * @task render     Rendering Results
- *
- * @group search
  */
 abstract class PhabricatorApplicationSearchEngine {
 
   private $application;
   private $viewer;
   private $errors = array();
   private $customFields = false;
   private $request;
   private $context;
 
   const CONTEXT_LIST  = 'list';
   const CONTEXT_PANEL = 'panel';
 
   public function setViewer(PhabricatorUser $viewer) {
     $this->viewer = $viewer;
     return $this;
   }
 
   protected function requireViewer() {
     if (!$this->viewer) {
       throw new Exception('Call setViewer() before using an engine!');
     }
     return $this->viewer;
   }
 
   public function setContext($context) {
     $this->context = $context;
     return $this;
   }
 
   public function isPanelContext() {
     return ($this->context == self::CONTEXT_PANEL);
   }
 
   public function saveQuery(PhabricatorSavedQuery $query) {
     $query->setEngineClassName(get_class($this));
 
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
     try {
       $query->save();
     } catch (AphrontQueryDuplicateKeyException $ex) {
       // Ignore, this is just a repeated search.
     }
     unset($unguarded);
   }
 
   /**
    * Create a saved query object from the request.
    *
    * @param AphrontRequest The search request.
    * @return PhabricatorSavedQuery
    */
   abstract public function buildSavedQueryFromRequest(
     AphrontRequest $request);
 
   /**
    * Executes the saved query.
    *
    * @param PhabricatorSavedQuery The saved query to operate on.
    * @return The result of the query.
    */
   abstract public function buildQueryFromSavedQuery(
     PhabricatorSavedQuery $saved);
 
   /**
    * Builds the search form using the request.
    *
    * @param AphrontFormView       Form to populate.
    * @param PhabricatorSavedQuery The query from which to build the form.
    * @return void
    */
   abstract public function buildSearchForm(
     AphrontFormView $form,
     PhabricatorSavedQuery $query);
 
   public function getErrors() {
     return $this->errors;
   }
 
   public function addError($error) {
     $this->errors[] = $error;
     return $this;
   }
 
   /**
    * Return an application URI corresponding to the results page of a query.
    * Normally, this is something like `/application/query/QUERYKEY/`.
    *
    * @param   string  The query key to build a URI for.
    * @return  string  URI where the query can be executed.
    * @task uri
    */
   public function getQueryResultsPageURI($query_key) {
     return $this->getURI('query/'.$query_key.'/');
   }
 
 
   /**
    * Return an application URI for query management. This is used when, e.g.,
    * a query deletion operation is cancelled.
    *
    * @return  string  URI where queries can be managed.
    * @task uri
    */
   public function getQueryManagementURI() {
     return $this->getURI('query/edit/');
   }
 
 
   /**
    * Return the URI to a path within the application. Used to construct default
    * URIs for management and results.
    *
    * @return string URI to path.
    * @task uri
    */
   abstract protected function getURI($path);
 
 
   /**
    * Return a human readable description of the type of objects this query
    * searches for.
    *
    * For example, "Tasks" or "Commits".
    *
    * @return string Human-readable description of what this engine is used to
    *   find.
    */
   abstract public function getResultTypeDescription();
 
 
   public function newSavedQuery() {
     return id(new PhabricatorSavedQuery())
       ->setEngineClassName(get_class($this));
   }
 
   public function addNavigationItems(PHUIListView $menu) {
     $viewer = $this->requireViewer();
 
     $menu->newLabel(pht('Queries'));
 
     $named_queries = $this->loadEnabledNamedQueries();
 
     foreach ($named_queries as $query) {
       $key = $query->getQueryKey();
       $uri = $this->getQueryResultsPageURI($key);
       $menu->newLink($query->getQueryName(), $uri, 'query/'.$key);
     }
 
     if ($viewer->isLoggedIn()) {
       $manage_uri = $this->getQueryManagementURI();
       $menu->newLink(pht('Edit Queries...'), $manage_uri, 'query/edit');
     }
 
     $menu->newLabel(pht('Search'));
     $advanced_uri = $this->getQueryResultsPageURI('advanced');
     $menu->newLink(pht('Advanced Search'), $advanced_uri, 'query/advanced');
 
     return $this;
   }
 
   public function loadAllNamedQueries() {
     $viewer = $this->requireViewer();
 
     $named_queries = id(new PhabricatorNamedQueryQuery())
       ->setViewer($viewer)
       ->withUserPHIDs(array($viewer->getPHID()))
       ->withEngineClassNames(array(get_class($this)))
       ->execute();
     $named_queries = mpull($named_queries, null, 'getQueryKey');
 
     $builtin = $this->getBuiltinQueries($viewer);
     $builtin = mpull($builtin, null, 'getQueryKey');
 
     foreach ($named_queries as $key => $named_query) {
       if ($named_query->getIsBuiltin()) {
         if (isset($builtin[$key])) {
           $named_queries[$key]->setQueryName($builtin[$key]->getQueryName());
           unset($builtin[$key]);
         } else {
           unset($named_queries[$key]);
         }
       }
 
       unset($builtin[$key]);
     }
 
     $named_queries = msort($named_queries, 'getSortKey');
 
     return $named_queries + $builtin;
   }
 
   public function loadEnabledNamedQueries() {
     $named_queries = $this->loadAllNamedQueries();
     foreach ($named_queries as $key => $named_query) {
       if ($named_query->getIsBuiltin() && $named_query->getIsDisabled()) {
         unset($named_queries[$key]);
       }
     }
     return $named_queries;
   }
 
 
 /* -(  Applications  )------------------------------------------------------- */
 
 
   protected function getApplicationURI($path = '') {
     return $this->getApplication()->getApplicationURI($path);
   }
 
   protected function getApplication() {
     if (!$this->application) {
       $class = $this->getApplicationClassName();
 
       $this->application = id(new PhabricatorApplicationQuery())
         ->setViewer($this->requireViewer())
         ->withClasses(array($class))
         ->withInstalled(true)
         ->executeOne();
 
       if (!$this->application) {
         throw new Exception(
           pht(
             'Application "%s" is not installed!',
             $class));
       }
     }
 
     return $this->application;
   }
 
   protected function getApplicationClassName() {
     throw new Exception(pht('Not implemented for this SearchEngine yet!'));
   }
 
 
 /* -(  Constructing Engines  )----------------------------------------------- */
 
 
   /**
    * Load all available application search engines.
    *
    * @return list<PhabricatorApplicationSearchEngine> All available engines.
    * @task construct
    */
   public static function getAllEngines() {
     $engines = id(new PhutilSymbolLoader())
       ->setAncestorClass(__CLASS__)
       ->loadObjects();
 
     return $engines;
   }
 
 
   /**
    * Get an engine by class name, if it exists.
    *
    * @return PhabricatorApplicationSearchEngine|null Engine, or null if it does
    *   not exist.
    * @task construct
    */
   public static function getEngineByClassName($class_name) {
     return idx(self::getAllEngines(), $class_name);
   }
 
 
 /* -(  Builtin Queries  )---------------------------------------------------- */
 
 
   /**
    * @task builtin
    */
   public function getBuiltinQueries() {
     $names = $this->getBuiltinQueryNames();
 
     $queries = array();
     $sequence = 0;
     foreach ($names as $key => $name) {
       $queries[$key] = id(new PhabricatorNamedQuery())
         ->setUserPHID($this->requireViewer()->getPHID())
         ->setEngineClassName(get_class($this))
         ->setQueryName($name)
         ->setQueryKey($key)
         ->setSequence((1 << 24) + $sequence++)
         ->setIsBuiltin(true);
     }
 
     return $queries;
   }
 
 
   /**
    * @task builtin
    */
   public function getBuiltinQuery($query_key) {
     if (!$this->isBuiltinQuery($query_key)) {
       throw new Exception("'{$query_key}' is not a builtin!");
     }
     return idx($this->getBuiltinQueries(), $query_key);
   }
 
 
   /**
    * @task builtin
    */
   protected function getBuiltinQueryNames() {
     return array();
   }
 
 
   /**
    * @task builtin
    */
   public function isBuiltinQuery($query_key) {
     $builtins = $this->getBuiltinQueries();
     return isset($builtins[$query_key]);
   }
 
 
   /**
    * @task builtin
    */
   public function buildSavedQueryFromBuiltin($query_key) {
     throw new Exception("Builtin '{$query_key}' is not supported!");
   }
 
 
 /* -(  Reading Utilities )--------------------------------------------------- */
 
 
   /**
    * Read a list of user PHIDs from a request in a flexible way. This method
    * supports either of these forms:
    *
    *   users[]=alincoln&users[]=htaft
    *   users=alincoln,htaft
    *
    * Additionally, users can be specified either by PHID or by name.
    *
    * The main goal of this flexibility is to allow external programs to generate
    * links to pages (like "alincoln's open revisions") without needing to make
    * API calls.
    *
    * @param AphrontRequest  Request to read user PHIDs from.
    * @param string          Key to read in the request.
    * @param list<const>     Other permitted PHID types.
    * @return list<phid>     List of user PHIDs.
    *
    * @task read
    */
   protected function readUsersFromRequest(
     AphrontRequest $request,
     $key,
     array $allow_types = array()) {
 
     $list = $this->readListFromRequest($request, $key);
 
     $phids = array();
     $names = array();
     $allow_types = array_fuse($allow_types);
     $user_type = PhabricatorPHIDConstants::PHID_TYPE_USER;
     foreach ($list as $item) {
       $type = phid_get_type($item);
       if ($type == $user_type) {
         $phids[] = $item;
       } else if (isset($allow_types[$type])) {
         $phids[] = $item;
       } else {
         $names[] = $item;
       }
     }
 
     if ($names) {
       $users = id(new PhabricatorPeopleQuery())
         ->setViewer($this->requireViewer())
         ->withUsernames($names)
         ->execute();
       foreach ($users as $user) {
         $phids[] = $user->getPHID();
       }
       $phids = array_unique($phids);
     }
 
     return $phids;
   }
 
 
   /**
    * Read a list of generic PHIDs from a request in a flexible way. Like
    * @{method:readUsersFromRequest}, this method supports either array or
    * comma-delimited forms. Objects can be specified either by PHID or by
    * object name.
    *
    * @param AphrontRequest  Request to read PHIDs from.
    * @param string          Key to read in the request.
    * @param list<const>     Optional, list of permitted PHID types.
    * @return list<phid>     List of object PHIDs.
    *
    * @task read
    */
   protected function readPHIDsFromRequest(
     AphrontRequest $request,
     $key,
     array $allow_types = array()) {
 
     $list = $this->readListFromRequest($request, $key);
 
     $objects = id(new PhabricatorObjectQuery())
       ->setViewer($this->requireViewer())
       ->withNames($list)
       ->execute();
     $list = mpull($objects, 'getPHID');
 
     if (!$list) {
       return array();
     }
 
     // If only certain PHID types are allowed, filter out all the others.
     if ($allow_types) {
       $allow_types = array_fuse($allow_types);
       foreach ($list as $key => $phid) {
         if (empty($allow_types[phid_get_type($phid)])) {
           unset($list[$key]);
         }
       }
     }
 
     return $list;
   }
 
 
   /**
    * Read a list of items from the request, in either array format or string
    * format:
    *
    *   list[]=item1&list[]=item2
    *   list=item1,item2
    *
    * This provides flexibility when constructing URIs, especially from external
    * sources.
    *
    * @param AphrontRequest  Request to read strings from.
    * @param string          Key to read in the request.
    * @return list<string>   List of values.
    */
   protected function readListFromRequest(
     AphrontRequest $request,
     $key) {
     $list = $request->getArr($key, null);
     if ($list === null) {
       $list = $request->getStrList($key);
     }
 
     if (!$list) {
       return array();
     }
 
     return $list;
   }
 
   protected function readDateFromRequest(
     AphrontRequest $request,
     $key) {
 
     return id(new AphrontFormDateControl())
       ->setUser($this->requireViewer())
       ->setName($key)
       ->setAllowNull(true)
       ->readValueFromRequest($request);
   }
 
   protected function readBoolFromRequest(
     AphrontRequest $request,
     $key) {
     if (!strlen($request->getStr($key))) {
       return null;
     }
     return $request->getBool($key);
   }
 
 
   protected function getBoolFromQuery(PhabricatorSavedQuery $query, $key) {
     $value = $query->getParameter($key);
     if ($value === null) {
       return $value;
     }
     return $value ? 'true' : 'false';
   }
 
 
 /* -(  Dates  )-------------------------------------------------------------- */
 
 
   /**
    * @task dates
    */
   protected function parseDateTime($date_time) {
     if (!strlen($date_time)) {
       return null;
     }
 
     return PhabricatorTime::parseLocalTime($date_time, $this->requireViewer());
   }
 
 
   /**
    * @task dates
    */
   protected function buildDateRange(
     AphrontFormView $form,
     PhabricatorSavedQuery $saved_query,
     $start_key,
     $start_name,
     $end_key,
     $end_name) {
 
     $start_str = $saved_query->getParameter($start_key);
     $start = null;
     if (strlen($start_str)) {
       $start = $this->parseDateTime($start_str);
       if (!$start) {
         $this->addError(
           pht(
             '"%s" date can not be parsed.',
             $start_name));
       }
     }
 
 
     $end_str = $saved_query->getParameter($end_key);
     $end = null;
     if (strlen($end_str)) {
       $end = $this->parseDateTime($end_str);
       if (!$end) {
         $this->addError(
           pht(
             '"%s" date can not be parsed.',
             $end_name));
       }
     }
 
     if ($start && $end && ($start >= $end)) {
       $this->addError(
         pht(
           '"%s" must be a date before "%s".',
           $start_name,
           $end_name));
     }
 
     $form
       ->appendChild(
         id(new PHUIFormFreeformDateControl())
           ->setName($start_key)
           ->setLabel($start_name)
           ->setValue($start_str))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setName($end_key)
           ->setLabel($end_name)
           ->setValue($end_str));
   }
 
 
 /* -(  Paging and Executing Queries  )--------------------------------------- */
 
 
   public function getPageSize(PhabricatorSavedQuery $saved) {
     return $saved->getParameter('limit', 100);
   }
 
 
   public function shouldUseOffsetPaging() {
     return false;
   }
 
 
   public function newPagerForSavedQuery(PhabricatorSavedQuery $saved) {
     if ($this->shouldUseOffsetPaging()) {
       $pager = new AphrontPagerView();
     } else {
       $pager = new AphrontCursorPagerView();
     }
 
     $page_size = $this->getPageSize($saved);
     if (is_finite($page_size)) {
       $pager->setPageSize($page_size);
     } else {
       // Consider an INF pagesize to mean a large finite pagesize.
 
       // TODO: It would be nice to handle this more gracefully, but math
       // with INF seems to vary across PHP versions, systems, and runtimes.
       $pager->setPageSize(0xFFFF);
     }
 
     return $pager;
   }
 
 
   public function executeQuery(
     PhabricatorPolicyAwareQuery $query,
     AphrontView $pager) {
 
     $query->setViewer($this->requireViewer());
 
     if ($this->shouldUseOffsetPaging()) {
       $objects = $query->executeWithOffsetPager($pager);
     } else {
       $objects = $query->executeWithCursorPager($pager);
     }
 
     return $objects;
   }
 
 
 /* -(  Rendering  )---------------------------------------------------------- */
 
 
   public function setRequest(AphrontRequest $request) {
     $this->request = $request;
     return $this;
   }
 
   public function getRequest() {
     return $this->request;
   }
 
   public function renderResults(
     array $objects,
     PhabricatorSavedQuery $query) {
 
     $phids = $this->getRequiredHandlePHIDsForResultList($objects, $query);
 
     if ($phids) {
       $handles = id(new PhabricatorHandleQuery())
         ->setViewer($this->requireViewer())
         ->witHPHIDs($phids)
         ->execute();
     } else {
       $handles = array();
     }
 
     return $this->renderResultList($objects, $query, $handles);
   }
 
   protected function getRequiredHandlePHIDsForResultList(
     array $objects,
     PhabricatorSavedQuery $query) {
     return array();
   }
 
   protected function renderResultList(
     array $objects,
     PhabricatorSavedQuery $query,
     array $handles) {
     throw new Exception(pht('Not supported here yet!'));
   }
 
 
 /* -(  Application Search  )------------------------------------------------- */
 
 
   /**
    * Retrieve an object to use to define custom fields for this search.
    *
    * To integrate with custom fields, subclasses should override this method
    * and return an instance of the application object which implements
    * @{interface:PhabricatorCustomFieldInterface}.
    *
    * @return PhabricatorCustomFieldInterface|null Object with custom fields.
    * @task appsearch
    */
   public function getCustomFieldObject() {
     return null;
   }
 
 
   /**
    * Get the custom fields for this search.
    *
    * @return PhabricatorCustomFieldList|null Custom fields, if this search
    *   supports custom fields.
    * @task appsearch
    */
   public function getCustomFieldList() {
     if ($this->customFields === false) {
       $object = $this->getCustomFieldObject();
       if ($object) {
         $fields = PhabricatorCustomField::getObjectFields(
           $object,
           PhabricatorCustomField::ROLE_APPLICATIONSEARCH);
         $fields->setViewer($this->requireViewer());
       } else {
         $fields = null;
       }
       $this->customFields = $fields;
     }
     return $this->customFields;
   }
 
 
   /**
    * Moves data from the request into a saved query.
    *
    * @param AphrontRequest Request to read.
    * @param PhabricatorSavedQuery Query to write to.
    * @return void
    * @task appsearch
    */
   protected function readCustomFieldsFromRequest(
     AphrontRequest $request,
     PhabricatorSavedQuery $saved) {
 
     $list = $this->getCustomFieldList();
     if (!$list) {
       return;
     }
 
     foreach ($list->getFields() as $field) {
       $key = $this->getKeyForCustomField($field);
       $value = $field->readApplicationSearchValueFromRequest(
         $this,
         $request);
       $saved->setParameter($key, $value);
     }
   }
 
 
   /**
    * Applies data from a saved query to an executable query.
    *
    * @param PhabricatorCursorPagedPolicyAwareQuery Query to constrain.
    * @param PhabricatorSavedQuery Saved query to read.
    * @return void
    */
   protected function applyCustomFieldsToQuery(
     PhabricatorCursorPagedPolicyAwareQuery $query,
     PhabricatorSavedQuery $saved) {
 
     $list = $this->getCustomFieldList();
     if (!$list) {
       return;
     }
 
     foreach ($list->getFields() as $field) {
       $key = $this->getKeyForCustomField($field);
       $value = $field->applyApplicationSearchConstraintToQuery(
         $this,
         $query,
         $saved->getParameter($key));
     }
   }
 
 
   /**
    * Get a unique key identifying a field.
    *
    * @param PhabricatorCustomField Field to identify.
    * @return string Unique identifier, suitable for use as an input name.
    */
   public function getKeyForCustomField(PhabricatorCustomField $field) {
     return 'custom:'.$field->getFieldIndex();
   }
 
 
   /**
    * Add inputs to an application search form so the user can query on custom
    * fields.
    *
    * @param AphrontFormView Form to update.
    * @param PhabricatorSavedQuery Values to prefill.
    * @return void
    */
   protected function appendCustomFieldsToForm(
     AphrontFormView $form,
     PhabricatorSavedQuery $saved) {
 
     $list = $this->getCustomFieldList();
     if (!$list) {
       return;
     }
 
     $phids = array();
     foreach ($list->getFields() as $field) {
       $key = $this->getKeyForCustomField($field);
       $value = $saved->getParameter($key);
       $phids[$key] = $field->getRequiredHandlePHIDsForApplicationSearch($value);
     }
     $all_phids = array_mergev($phids);
 
     $handles = array();
     if ($all_phids) {
       $handles = id(new PhabricatorHandleQuery())
         ->setViewer($this->requireViewer())
         ->withPHIDs($all_phids)
         ->execute();
     }
 
     foreach ($list->getFields() as $field) {
       $key = $this->getKeyForCustomField($field);
       $value = $saved->getParameter($key);
       $field->appendToApplicationSearchForm(
         $this,
         $form,
         $value,
         array_select_keys($handles, $phids[$key]));
     }
   }
 
 }
diff --git a/src/applications/search/engine/PhabricatorSearchEngineMySQL.php b/src/applications/search/engine/PhabricatorSearchEngineMySQL.php
index 704fedce8a..5ec221b61b 100644
--- a/src/applications/search/engine/PhabricatorSearchEngineMySQL.php
+++ b/src/applications/search/engine/PhabricatorSearchEngineMySQL.php
@@ -1,339 +1,334 @@
 <?php
 
-/**
- * @group search
- */
 final class PhabricatorSearchEngineMySQL extends PhabricatorSearchEngine {
 
   public function reindexAbstractDocument(
     PhabricatorSearchAbstractDocument $doc) {
 
     $phid = $doc->getPHID();
     if (!$phid) {
       throw new Exception('Document has no PHID!');
     }
 
     $store = new PhabricatorSearchDocument();
     $store->setPHID($doc->getPHID());
     $store->setDocumentType($doc->getDocumentType());
     $store->setDocumentTitle($doc->getDocumentTitle());
     $store->setDocumentCreated($doc->getDocumentCreated());
     $store->setDocumentModified($doc->getDocumentModified());
     $store->replace();
 
     $conn_w = $store->establishConnection('w');
 
     $field_dao = new PhabricatorSearchDocumentField();
     queryfx(
       $conn_w,
       'DELETE FROM %T WHERE phid = %s',
       $field_dao->getTableName(),
       $phid);
     foreach ($doc->getFieldData() as $field) {
       list($ftype, $corpus, $aux_phid) = $field;
       queryfx(
         $conn_w,
         'INSERT INTO %T (phid, phidType, field, auxPHID, corpus) '.
         ' VALUES (%s, %s, %s, %ns, %s)',
         $field_dao->getTableName(),
         $phid,
         $doc->getDocumentType(),
         $ftype,
         $aux_phid,
         $corpus);
     }
 
 
     $sql = array();
     foreach ($doc->getRelationshipData() as $relationship) {
       list($rtype, $to_phid, $to_type, $time) = $relationship;
       $sql[] = qsprintf(
         $conn_w,
         '(%s, %s, %s, %s, %d)',
         $phid,
         $to_phid,
         $rtype,
         $to_type,
         $time);
     }
 
     $rship_dao = new PhabricatorSearchDocumentRelationship();
     queryfx(
       $conn_w,
       'DELETE FROM %T WHERE phid = %s',
       $rship_dao->getTableName(),
       $phid);
     if ($sql) {
       queryfx(
         $conn_w,
         'INSERT INTO %T'.
         ' (phid, relatedPHID, relation, relatedType, relatedTime) '.
         ' VALUES %Q',
         $rship_dao->getTableName(),
         implode(', ', $sql));
     }
 
   }
 
   /**
    * Rebuild the PhabricatorSearchAbstractDocument that was used to index
    * an object out of the index itself. This is primarily useful for debugging,
    * as it allows you to inspect the search index representation of a
    * document.
    *
    * @param  phid PHID of a document which exists in the search index.
    * @return null|PhabricatorSearchAbstractDocument Abstract document object
    *           which corresponds to the original abstract document used to
    *           build the document index.
    */
   public function reconstructDocument($phid) {
     $dao_doc = new PhabricatorSearchDocument();
     $dao_field = new PhabricatorSearchDocumentField();
     $dao_relationship = new PhabricatorSearchDocumentRelationship();
 
     $t_doc = $dao_doc->getTableName();
     $t_field = $dao_field->getTableName();
     $t_relationship = $dao_relationship->getTableName();
 
     $doc = queryfx_one(
       $dao_doc->establishConnection('r'),
       'SELECT * FROM %T WHERE phid = %s',
       $t_doc,
       $phid);
 
     if (!$doc) {
       return null;
     }
 
     $fields = queryfx_all(
       $dao_field->establishConnection('r'),
       'SELECT * FROM %T WHERE phid = %s',
       $t_field,
       $phid);
 
     $relationships = queryfx_all(
       $dao_relationship->establishConnection('r'),
       'SELECT * FROM %T WHERE phid = %s',
       $t_relationship,
       $phid);
 
     $adoc = id(new PhabricatorSearchAbstractDocument())
       ->setPHID($phid)
       ->setDocumentType($doc['documentType'])
       ->setDocumentTitle($doc['documentTitle'])
       ->setDocumentCreated($doc['documentCreated'])
       ->setDocumentModified($doc['documentModified']);
 
     foreach ($fields as $field) {
       $adoc->addField(
         $field['field'],
         $field['corpus'],
         $field['auxPHID']);
     }
 
     foreach ($relationships as $relationship) {
       $adoc->addRelationship(
         $relationship['relation'],
         $relationship['relatedPHID'],
         $relationship['relatedType'],
         $relationship['relatedTime']);
     }
 
     return $adoc;
   }
 
   public function executeSearch(PhabricatorSavedQuery $query) {
-
     $where = array();
     $join  = array();
     $order = 'ORDER BY documentCreated DESC';
 
     $dao_doc = new PhabricatorSearchDocument();
     $dao_field = new PhabricatorSearchDocumentField();
 
     $t_doc   = $dao_doc->getTableName();
     $t_field = $dao_field->getTableName();
 
     $conn_r = $dao_doc->establishConnection('r');
 
     $q = $query->getParameter('query');
 
     if (strlen($q)) {
      $join[] = qsprintf(
         $conn_r,
         '%T field ON field.phid = document.phid',
         $t_field);
       $where[] = qsprintf(
         $conn_r,
         'MATCH(corpus) AGAINST (%s IN BOOLEAN MODE)',
         $q);
 
       // When searching for a string, promote user listings above other
       // listings.
       $order = qsprintf(
         $conn_r,
         'ORDER BY
           IF(documentType = %s, 0, 1) ASC,
           MAX(MATCH(corpus) AGAINST (%s)) DESC',
         'USER',
         $q);
 
       $field = $query->getParameter('field');
       if ($field) {
         $where[] = qsprintf(
           $conn_r,
           'field.field = %s',
           $field);
       }
     }
 
     $exclude = $query->getParameter('exclude');
     if ($exclude) {
       $where[] = qsprintf($conn_r, 'document.phid != %s', $exclude);
     }
 
     $types = $query->getParameter('types');
     if ($types) {
       if (strlen($q)) {
         $where[] = qsprintf(
           $conn_r,
           'field.phidType IN (%Ls)',
           $types);
       }
       $where[] = qsprintf(
         $conn_r,
         'document.documentType IN (%Ls)',
         $types);
     }
 
     $join[] = $this->joinRelationship(
       $conn_r,
       $query,
       'authorPHIDs',
       PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR);
 
     $statuses = $query->getParameter('statuses', array());
     $statuses = array_fuse($statuses);
     $open_rel = PhabricatorSearchRelationship::RELATIONSHIP_OPEN;
     $closed_rel = PhabricatorSearchRelationship::RELATIONSHIP_CLOSED;
     $include_open = !empty($statuses[$open_rel]);
     $include_closed = !empty($statuses[$closed_rel]);
 
     if ($include_open && !$include_closed) {
       $join[] = $this->joinRelationship(
         $conn_r,
         $query,
         'statuses',
         $open_rel,
         true);
     } else if ($include_closed && !$include_open) {
       $join[] = $this->joinRelationship(
         $conn_r,
         $query,
         'statuses',
         $closed_rel,
         true);
     }
 
     if ($query->getParameter('withUnowned')) {
       $join[] = $this->joinRelationship(
         $conn_r,
         $query,
         'withUnowned',
         PhabricatorSearchRelationship::RELATIONSHIP_UNOWNED,
         true);
     } else {
       $join[] = $this->joinRelationship(
         $conn_r,
         $query,
         'ownerPHIDs',
         PhabricatorSearchRelationship::RELATIONSHIP_OWNER);
     }
 
     $join[] = $this->joinRelationship(
       $conn_r,
       $query,
       'subscriberPHIDs',
       PhabricatorSearchRelationship::RELATIONSHIP_SUBSCRIBER);
 
     $join[] = $this->joinRelationship(
       $conn_r,
       $query,
       'projectPHIDs',
       PhabricatorSearchRelationship::RELATIONSHIP_PROJECT);
 
     $join[] = $this->joinRelationship(
       $conn_r,
       $query,
       'repository',
       PhabricatorSearchRelationship::RELATIONSHIP_REPOSITORY);
 
     $join = array_filter($join);
 
     foreach ($join as $key => $clause) {
       $join[$key] = ' JOIN '.$clause;
     }
     $join = implode(' ', $join);
 
     if ($where) {
       $where = 'WHERE '.implode(' AND ', $where);
     } else {
       $where = '';
     }
 
     $offset = (int)$query->getParameter('offset', 0);
     $limit  = (int)$query->getParameter('limit', 25);
 
     $hits = queryfx_all(
       $conn_r,
       'SELECT
         document.phid
         FROM %T document
           %Q
           %Q
         GROUP BY document.phid
           %Q
         LIMIT %d, %d',
       $t_doc,
       $join,
       $where,
       $order,
       $offset,
       $limit);
 
     return ipull($hits, 'phid');
   }
 
   protected function joinRelationship(
     AphrontDatabaseConnection $conn,
     PhabricatorSavedQuery $query,
     $field,
     $type,
     $is_existence = false) {
 
     $sql = qsprintf(
       $conn,
       '%T AS %C ON %C.phid = document.phid AND %C.relation = %s',
       id(new PhabricatorSearchDocumentRelationship())->getTableName(),
       $field,
       $field,
       $field,
       $type);
 
     if (!$is_existence) {
       $phids = $query->getParameter($field, array());
       if (!$phids) {
         return null;
       }
       $sql .= qsprintf(
         $conn,
         ' AND %C.relatedPHID in (%Ls)',
         $field,
         $phids);
     }
 
     return $sql;
   }
 
-
 }
diff --git a/src/applications/search/index/PhabricatorSearchDocumentIndexer.php b/src/applications/search/index/PhabricatorSearchDocumentIndexer.php
index 4781a8fdd2..1758f05416 100644
--- a/src/applications/search/index/PhabricatorSearchDocumentIndexer.php
+++ b/src/applications/search/index/PhabricatorSearchDocumentIndexer.php
@@ -1,159 +1,156 @@
 <?php
 
-/**
- * @group search
- */
 abstract class PhabricatorSearchDocumentIndexer {
 
   abstract public function getIndexableObject();
   abstract protected function buildAbstractDocumentByPHID($phid);
 
   protected function getViewer() {
     return PhabricatorUser::getOmnipotentUser();
   }
 
   public function shouldIndexDocumentByPHID($phid) {
     $object = $this->getIndexableObject();
     return (phid_get_type($phid) == phid_get_type($object->generatePHID()));
   }
 
   public function getIndexIterator() {
     $object = $this->getIndexableObject();
     return new LiskMigrationIterator($object);
   }
 
   protected function loadDocumentByPHID($phid) {
     $object = id(new PhabricatorObjectQuery())
       ->setViewer($this->getViewer())
       ->withPHIDs(array($phid))
       ->executeOne();
     if (!$object) {
       throw new Exception("Unable to load object by phid '{$phid}'!");
     }
     return $object;
   }
 
   public function indexDocumentByPHID($phid) {
     try {
       $document = $this->buildAbstractDocumentByPHID($phid);
 
       $object = $this->loadDocumentByPHID($phid);
 
       // Automatically rebuild CustomField indexes if the object uses custom
       // fields.
       if ($object instanceof PhabricatorCustomFieldInterface) {
         $this->indexCustomFields($document, $object);
       }
 
       // Automatically rebuild subscriber indexes if the object is subscribable.
       if ($object instanceof PhabricatorSubscribableInterface) {
         $this->indexSubscribers($document);
       }
 
       $engine = PhabricatorSearchEngineSelector::newSelector()->newEngine();
       try {
         $engine->reindexAbstractDocument($document);
       } catch (Exception $ex) {
         $phid = $document->getPHID();
         $class = get_class($engine);
 
         phlog("Unable to index document {$phid} with engine {$class}.");
         phlog($ex);
       }
 
       $this->dispatchDidUpdateIndexEvent($phid, $document);
     } catch (Exception $ex) {
       $class = get_class($this);
       phlog("Unable to build document {$phid} with indexer {$class}.");
       phlog($ex);
     }
 
     return $this;
   }
 
   protected function newDocument($phid) {
     return id(new PhabricatorSearchAbstractDocument())
       ->setPHID($phid)
       ->setDocumentType(phid_get_type($phid));
   }
 
   protected function indexSubscribers(
     PhabricatorSearchAbstractDocument $doc) {
 
     $subscribers = PhabricatorSubscribersQuery::loadSubscribersForPHID(
       $doc->getPHID());
     $handles = id(new PhabricatorHandleQuery())
       ->setViewer($this->getViewer())
       ->withPHIDs($subscribers)
       ->execute();
 
     foreach ($handles as $phid => $handle) {
       $doc->addRelationship(
         PhabricatorSearchRelationship::RELATIONSHIP_SUBSCRIBER,
         $phid,
         $handle->getType(),
         $doc->getDocumentModified()); // Bogus timestamp.
     }
   }
 
   protected function indexTransactions(
     PhabricatorSearchAbstractDocument $doc,
     PhabricatorApplicationTransactionQuery $query,
     array $phids) {
 
     $xactions = id(clone $query)
       ->setViewer($this->getViewer())
       ->withObjectPHIDs($phids)
       ->withTransactionTypes(array(PhabricatorTransactions::TYPE_COMMENT))
       ->execute();
 
     foreach ($xactions as $xaction) {
       if (!$xaction->hasComment()) {
         continue;
       }
 
       $comment = $xaction->getComment();
       $doc->addField(
         PhabricatorSearchField::FIELD_COMMENT,
         $comment->getContent());
     }
   }
 
   protected function indexCustomFields(
     PhabricatorSearchAbstractDocument $document,
     PhabricatorCustomFieldInterface $object) {
 
     // Rebuild the ApplicationSearch indexes. These are internal and not part of
     // the fulltext search, but putting them in this workflow allows users to
     // use the same tools to rebuild the indexes, which is easy to understand.
 
     $field_list = PhabricatorCustomField::getObjectFields(
       $object,
       PhabricatorCustomField::ROLE_DEFAULT);
 
     $field_list->setViewer($this->getViewer());
     $field_list->readFieldsFromStorage($object);
 
     // Rebuild ApplicationSearch indexes.
     $field_list->rebuildIndexes($object);
 
     // Rebuild global search indexes.
     $field_list->updateAbstractDocument($document);
   }
 
   private function dispatchDidUpdateIndexEvent(
     $phid,
     PhabricatorSearchAbstractDocument $document) {
 
     $event = new PhabricatorEvent(
       PhabricatorEventType::TYPE_SEARCH_DIDUPDATEINDEX,
       array(
         'phid'      => $phid,
         'object'    => $this->loadDocumentByPHID($phid),
         'document'  => $document,
       ));
     $event->setUser($this->getViewer());
     PhutilEventEngine::dispatchEvent($event);
   }
 
 }
diff --git a/src/applications/search/management/PhabricatorSearchManagementIndexWorkflow.php b/src/applications/search/management/PhabricatorSearchManagementIndexWorkflow.php
index 63df499bc5..44753e3e24 100644
--- a/src/applications/search/management/PhabricatorSearchManagementIndexWorkflow.php
+++ b/src/applications/search/management/PhabricatorSearchManagementIndexWorkflow.php
@@ -1,149 +1,146 @@
 <?php
 
-/**
- * @group search
- */
 final class PhabricatorSearchManagementIndexWorkflow
   extends PhabricatorSearchManagementWorkflow {
 
   protected function didConstruct() {
     $this
       ->setName('index')
       ->setSynopsis('Build or rebuild search indexes.')
       ->setExamples(
         "**index** D123\n".
         "**index** --type DREV\n".
         "**index** --all")
       ->setArguments(
         array(
           array(
             'name' => 'all',
             'help' => 'Reindex all documents.',
           ),
           array(
             'name'  => 'type',
             'param' => 'TYPE',
             'help'  => 'PHID type to reindex, like "TASK" or "DREV".',
           ),
           array(
             'name' => 'background',
             'help' => 'Instead of indexing in this process, queue tasks for '.
                       'the daemons. This can improve performance, but makes '.
                       'it more difficult to debug search indexing.',
           ),
           array(
             'name'      => 'objects',
             'wildcard'  => true,
           ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
 
     $is_all = $args->getArg('all');
     $is_type = $args->getArg('type');
 
     $obj_names = $args->getArg('objects');
 
     if ($obj_names && ($is_all || $is_type)) {
       throw new PhutilArgumentUsageException(
         "You can not name objects to index alongside the '--all' or '--type' ".
         "flags.");
     } else if (!$obj_names && !($is_all || $is_type)) {
       throw new PhutilArgumentUsageException(
         "Provide one of '--all', '--type' or a list of object names.");
     }
 
     if ($obj_names) {
       $phids = $this->loadPHIDsByNames($obj_names);
     } else {
       $phids = $this->loadPHIDsByTypes($is_type);
     }
 
     if (!$phids) {
       throw new PhutilArgumentUsageException('Nothing to index!');
     }
 
     if ($args->getArg('background')) {
       $is_background = true;
     } else {
       PhabricatorWorker::setRunAllTasksInProcess(true);
       $is_background = false;
     }
 
     if (!$is_background) {
       $console->writeOut(
         "%s\n",
         pht(
           'Run this workflow with "--background" to queue tasks for the '.
           'daemon workers.'));
     }
 
     $groups = phid_group_by_type($phids);
     foreach ($groups as $group_type => $group) {
       $console->writeOut(
         "%s\n",
         pht('Indexing %d object(s) of type %s.', count($group), $group_type));
     }
 
     $bar = id(new PhutilConsoleProgressBar())
       ->setTotal(count($phids));
 
     $indexer = new PhabricatorSearchIndexer();
     foreach ($phids as $phid) {
       $indexer->queueDocumentForIndexing($phid);
       $bar->update(1);
     }
 
     $bar->done();
   }
 
   private function loadPHIDsByNames(array $names) {
     $query = id(new PhabricatorObjectQuery())
       ->setViewer($this->getViewer())
       ->withNames($names);
     $query->execute();
     $objects = $query->getNamedResults();
 
     foreach ($names as $name) {
       if (empty($objects[$name])) {
         throw new PhutilArgumentUsageException(
           "'{$name}' is not the name of a known object.");
       }
     }
 
     return mpull($objects, 'getPHID');
   }
 
   private function loadPHIDsByTypes($type) {
     $indexer_symbols = id(new PhutilSymbolLoader())
       ->setAncestorClass('PhabricatorSearchDocumentIndexer')
       ->setConcreteOnly(true)
       ->setType('class')
       ->selectAndLoadSymbols();
 
     $indexers = array();
     foreach ($indexer_symbols as $symbol) {
       $indexers[] = newv($symbol['name'], array());
     }
 
     $phids = array();
     foreach ($indexers as $indexer) {
       $indexer_phid = $indexer->getIndexableObject()->generatePHID();
       $indexer_type = phid_get_type($indexer_phid);
 
       if ($type && strcasecmp($indexer_type, $type)) {
         continue;
       }
 
       $iterator = $indexer->getIndexIterator();
       foreach ($iterator as $object) {
         $phids[] = $object->getPHID();
       }
     }
 
     return $phids;
   }
 
 }
diff --git a/src/applications/search/query/PhabricatorNamedQueryQuery.php b/src/applications/search/query/PhabricatorNamedQueryQuery.php
index dccd228a32..1d0e4880c7 100644
--- a/src/applications/search/query/PhabricatorNamedQueryQuery.php
+++ b/src/applications/search/query/PhabricatorNamedQueryQuery.php
@@ -1,90 +1,87 @@
 <?php
 
-/**
- * @group search
- */
 final class PhabricatorNamedQueryQuery
   extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $ids;
   private $engineClassNames;
   private $userPHIDs;
   private $queryKeys;
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
     return $this;
   }
 
   public function withUserPHIDs(array $user_phids) {
     $this->userPHIDs = $user_phids;
     return $this;
   }
 
   public function withEngineClassNames(array $engine_class_names) {
     $this->engineClassNames = $engine_class_names;
     return $this;
   }
 
   public function withQueryKeys(array $query_keys) {
     $this->queryKeys = $query_keys;
     return $this;
   }
 
   protected function loadPage() {
     $table = new PhabricatorNamedQuery();
     $conn_r = $table->establishConnection('r');
 
     $data = queryfx_all(
       $conn_r,
       'SELECT * FROM %T %Q %Q %Q',
       $table->getTableName(),
       $this->buildWhereClause($conn_r),
       $this->buildOrderClause($conn_r),
       $this->buildLimitClause($conn_r));
 
     return $table->loadAllFromArray($data);
   }
 
   private function buildWhereClause($conn_r) {
     $where = array();
 
     if ($this->ids) {
       $where[] = qsprintf(
         $conn_r,
         'id IN (%Ld)',
         $this->ids);
     }
 
     if ($this->engineClassNames) {
       $where[] = qsprintf(
         $conn_r,
         'engineClassName IN (%Ls)',
         $this->engineClassNames);
     }
 
     if ($this->userPHIDs) {
       $where[] = qsprintf(
         $conn_r,
         'userPHID IN (%Ls)',
         $this->userPHIDs);
     }
 
     if ($this->queryKeys) {
       $where[] = qsprintf(
         $conn_r,
         'queryKey IN (%Ls)',
         $this->queryKeys);
     }
 
     $where[] = $this->buildPagingClause($conn_r);
 
     return $this->formatWhereClause($where);
   }
 
 
   public function getQueryApplicationClass() {
     return 'PhabricatorApplicationSearch';
   }
 
 }
diff --git a/src/applications/search/selector/PhabricatorDefaultSearchEngineSelector.php b/src/applications/search/selector/PhabricatorDefaultSearchEngineSelector.php
index ff14ebb859..58049d5831 100644
--- a/src/applications/search/selector/PhabricatorDefaultSearchEngineSelector.php
+++ b/src/applications/search/selector/PhabricatorDefaultSearchEngineSelector.php
@@ -1,16 +1,13 @@
 <?php
 
-/**
- * @group search
- */
 final class PhabricatorDefaultSearchEngineSelector
   extends PhabricatorSearchEngineSelector {
 
   public function newEngine() {
     $elastic_host = PhabricatorEnv::getEnvConfig('search.elastic.host');
     if ($elastic_host) {
       return new PhabricatorSearchEngineElastic($elastic_host);
     }
     return new PhabricatorSearchEngineMySQL();
   }
 }
diff --git a/src/applications/search/selector/PhabricatorSearchEngineSelector.php b/src/applications/search/selector/PhabricatorSearchEngineSelector.php
index 376f99982a..41219c61a9 100644
--- a/src/applications/search/selector/PhabricatorSearchEngineSelector.php
+++ b/src/applications/search/selector/PhabricatorSearchEngineSelector.php
@@ -1,18 +1,15 @@
 <?php
 
-/**
- * @group search
- */
 abstract class PhabricatorSearchEngineSelector {
 
   final public function __construct() {
     // <empty>
   }
 
   abstract public function newEngine();
 
   final public static function newSelector() {
     return PhabricatorEnv::newObjectFromConfig('search.engine-selector');
   }
 
 }
diff --git a/src/applications/search/storage/PhabricatorNamedQuery.php b/src/applications/search/storage/PhabricatorNamedQuery.php
index 12c16feb37..77be8f2e74 100644
--- a/src/applications/search/storage/PhabricatorNamedQuery.php
+++ b/src/applications/search/storage/PhabricatorNamedQuery.php
@@ -1,49 +1,45 @@
 <?php
 
-/**
- * @group search
- */
 final class PhabricatorNamedQuery extends PhabricatorSearchDAO
   implements PhabricatorPolicyInterface {
 
   protected $queryKey;
   protected $queryName;
   protected $userPHID;
   protected $engineClassName;
 
   protected $isBuiltin  = 0;
   protected $isDisabled = 0;
   protected $sequence   = 0;
 
   public function getSortKey() {
     return sprintf('~%010d%010d', $this->sequence, $this->getID());
   }
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
     );
   }
 
   public function getPolicy($capability) {
     return PhabricatorPolicies::POLICY_NOONE;
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     if ($viewer->getPHID() == $this->userPHID) {
       return true;
     }
     return false;
   }
 
   public function describeAutomaticCapability($capability) {
     return pht(
       'The queries you have saved are private. Only you can view or edit '.
       'them.');
   }
 
-
 }
diff --git a/src/applications/search/storage/PhabricatorSavedQuery.php b/src/applications/search/storage/PhabricatorSavedQuery.php
index 910b7d4581..aa371c5fcb 100644
--- a/src/applications/search/storage/PhabricatorSavedQuery.php
+++ b/src/applications/search/storage/PhabricatorSavedQuery.php
@@ -1,70 +1,67 @@
 <?php
 
-/**
- * @group search
- */
 final class PhabricatorSavedQuery extends PhabricatorSearchDAO
   implements PhabricatorPolicyInterface {
 
   protected $parameters = array();
   protected $queryKey;
   protected $engineClassName;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_SERIALIZATION => array(
         'parameters' => self::SERIALIZATION_JSON,
       ),
     ) + parent::getConfiguration();
   }
 
   public function setParameter($key, $value) {
     $this->parameters[$key] = $value;
     return $this;
   }
 
   public function getParameter($key, $default = null) {
     return idx($this->parameters, $key, $default);
   }
 
   public function save() {
     if ($this->getEngineClassName() === null) {
       throw new Exception(pht('Engine class is null.'));
     }
 
     // Instantiate the engine to make sure it's valid.
     $this->newEngine();
 
     $serial = $this->getEngineClassName().serialize($this->parameters);
     $this->queryKey = PhabricatorHash::digestForIndex($serial);
 
     return parent::save();
   }
 
   public function newEngine() {
     return newv($this->getEngineClassName(), array());
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
     );
   }
 
   public function getPolicy($capability) {
     return PhabricatorPolicies::POLICY_PUBLIC;
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return false;
   }
 
   public function describeAutomaticCapability($capability) {
     return null;
   }
 
 }
diff --git a/src/applications/search/storage/PhabricatorSearchDAO.php b/src/applications/search/storage/PhabricatorSearchDAO.php
index d4e2e397cc..39133cc83a 100644
--- a/src/applications/search/storage/PhabricatorSearchDAO.php
+++ b/src/applications/search/storage/PhabricatorSearchDAO.php
@@ -1,12 +1,9 @@
 <?php
 
-/**
- * @group search
- */
 abstract class PhabricatorSearchDAO extends PhabricatorLiskDAO {
 
   public function getApplicationName() {
     return 'search';
   }
 
 }
diff --git a/src/applications/search/storage/document/PhabricatorSearchDocument.php b/src/applications/search/storage/document/PhabricatorSearchDocument.php
index c658bd926d..bbdfd27537 100644
--- a/src/applications/search/storage/document/PhabricatorSearchDocument.php
+++ b/src/applications/search/storage/document/PhabricatorSearchDocument.php
@@ -1,25 +1,22 @@
 <?php
 
-/**
- * @group search
- */
 final class PhabricatorSearchDocument extends PhabricatorSearchDAO {
 
   protected $phid;
   protected $documentType;
   protected $documentTitle;
   protected $documentCreated;
   protected $documentModified;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_TIMESTAMPS => false,
       self::CONFIG_IDS        => self::IDS_MANUAL,
     ) + parent::getConfiguration();
   }
 
   public function getIDKey() {
     return 'phid';
   }
 
 }
diff --git a/src/applications/search/storage/document/PhabricatorSearchDocumentField.php b/src/applications/search/storage/document/PhabricatorSearchDocumentField.php
index ff56b1a5b8..04eda3b5fb 100644
--- a/src/applications/search/storage/document/PhabricatorSearchDocumentField.php
+++ b/src/applications/search/storage/document/PhabricatorSearchDocumentField.php
@@ -1,20 +1,17 @@
 <?php
 
-/**
- * @group search
- */
 final class PhabricatorSearchDocumentField extends PhabricatorSearchDAO {
 
   protected $phid;
   protected $field;
   protected $auxPHID;
   protected $corpus;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_TIMESTAMPS => false,
       self::CONFIG_IDS        => self::IDS_MANUAL,
     ) + parent::getConfiguration();
   }
 
 }
diff --git a/src/applications/search/storage/document/PhabricatorSearchDocumentRelationship.php b/src/applications/search/storage/document/PhabricatorSearchDocumentRelationship.php
index 1ac1cab47b..ded760dfb5 100644
--- a/src/applications/search/storage/document/PhabricatorSearchDocumentRelationship.php
+++ b/src/applications/search/storage/document/PhabricatorSearchDocumentRelationship.php
@@ -1,21 +1,18 @@
 <?php
 
-/**
- * @group search
- */
 final class PhabricatorSearchDocumentRelationship extends PhabricatorSearchDAO {
 
   protected $phid;
   protected $relatedPHID;
   protected $relation;
   protected $relatedType;
   protected $relatedTime;
 
   public function getConfiguration() {
     return array(
       self::CONFIG_TIMESTAMPS => false,
       self::CONFIG_IDS        => self::IDS_MANUAL,
     ) + parent::getConfiguration();
   }
 
 }
diff --git a/src/applications/slowvote/conduit/ConduitAPI_slowvote_Method.php b/src/applications/slowvote/conduit/ConduitAPI_slowvote_Method.php
index 3302de75a2..664546f3f8 100644
--- a/src/applications/slowvote/conduit/ConduitAPI_slowvote_Method.php
+++ b/src/applications/slowvote/conduit/ConduitAPI_slowvote_Method.php
@@ -1,13 +1,10 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class ConduitAPI_slowvote_Method extends ConduitAPIMethod {
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
       'PhabricatorApplicationSlowvote');
   }
 
 }
diff --git a/src/applications/slowvote/conduit/ConduitAPI_slowvote_info_Method.php b/src/applications/slowvote/conduit/ConduitAPI_slowvote_info_Method.php
index 4874f56a04..3bef8daf62 100644
--- a/src/applications/slowvote/conduit/ConduitAPI_slowvote_info_Method.php
+++ b/src/applications/slowvote/conduit/ConduitAPI_slowvote_info_Method.php
@@ -1,47 +1,44 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_slowvote_info_Method
   extends ConduitAPI_slowvote_Method {
 
   public function getMethodDescription() {
     return 'Retrieve an array of information about a poll.';
   }
 
   public function defineParamTypes() {
     return array(
       'poll_id' => 'required id',
     );
   }
 
   public function defineReturnType() {
     return 'nonempty dict';
   }
 
   public function defineErrorTypes() {
     return array(
       'ERR_BAD_POLL' => 'No such poll exists',
     );
   }
 
   protected function execute(ConduitAPIRequest $request) {
     $poll_id = $request->getValue('poll_id');
     $poll = id(new PhabricatorSlowvotePoll())->load($poll_id);
     if (!$poll) {
       throw new ConduitException('ERR_BAD_POLL');
     }
 
     $result = array(
       'id'          => $poll->getID(),
       'phid'        => $poll->getPHID(),
       'authorPHID'  => $poll->getAuthorPHID(),
       'question'    => $poll->getQuestion(),
       'uri'         => PhabricatorEnv::getProductionURI('/V'.$poll->getID()),
     );
 
     return $result;
   }
 
 }
diff --git a/src/applications/slowvote/controller/PhabricatorSlowvoteController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteController.php
index 58df51077f..4dd820cf04 100644
--- a/src/applications/slowvote/controller/PhabricatorSlowvoteController.php
+++ b/src/applications/slowvote/controller/PhabricatorSlowvoteController.php
@@ -1,44 +1,41 @@
 <?php
 
-/**
- * @group slowvote
- */
 abstract class PhabricatorSlowvoteController extends PhabricatorController {
 
   public function buildSideNavView($for_app = false) {
     $user = $this->getRequest()->getUser();
 
     $nav = new AphrontSideNavFilterView();
     $nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
 
     if ($for_app) {
       $nav->addFilter('', pht('Create Poll'),
         $this->getApplicationURI('create/'));
     }
 
     id(new PhabricatorSlowvoteSearchEngine())
       ->setViewer($user)
       ->addNavigationItems($nav->getMenu());
 
     $nav->selectFilter(null);
 
     return $nav;
   }
 
   public function buildApplicationMenu() {
     return $this->buildSideNavView(true)->getMenu();
   }
 
   public function buildApplicationCrumbs() {
     $crumbs = parent::buildApplicationCrumbs();
 
     $crumbs->addAction(
       id(new PHUIListItemView())
         ->setName(pht('Create Poll'))
         ->setHref($this->getApplicationURI('create/'))
         ->setIcon('fa-plus-square'));
 
     return $crumbs;
   }
 
 }
diff --git a/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php
index a5353f174b..9336fdb943 100644
--- a/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php
+++ b/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php
@@ -1,285 +1,282 @@
 <?php
 
-/**
- * @group slowvote
- */
 final class PhabricatorSlowvoteEditController
   extends PhabricatorSlowvoteController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = idx($data, 'id');
   }
 
   public function processRequest() {
 
     $request = $this->getRequest();
     $user = $request->getUser();
 
     if ($this->id) {
       $poll = id(new PhabricatorSlowvoteQuery())
         ->setViewer($user)
         ->withIDs(array($this->id))
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_VIEW,
             PhabricatorPolicyCapability::CAN_EDIT,
           ))
         ->executeOne();
       if (!$poll) {
         return new Aphront404Response();
       }
       $is_new = false;
     } else {
       $poll = PhabricatorSlowvotePoll::initializeNewPoll($user);
       $is_new = true;
     }
 
     if ($is_new) {
       $v_projects = array();
     } else {
       $v_projects = PhabricatorEdgeQuery::loadDestinationPHIDs(
         $poll->getPHID(),
         PhabricatorEdgeConfig::TYPE_OBJECT_HAS_PROJECT);
       $v_projects = array_reverse($v_projects);
     }
 
     $e_question = true;
     $e_response = true;
     $errors = array();
 
     $v_question = $poll->getQuestion();
     $v_description = $poll->getDescription();
     $v_responses = $poll->getResponseVisibility();
     $v_shuffle = $poll->getShuffle();
 
     $responses = $request->getArr('response');
     if ($request->isFormPost()) {
       $v_question = $request->getStr('question');
       $v_description = $request->getStr('description');
       $v_responses = (int)$request->getInt('responses');
       $v_shuffle = (int)$request->getBool('shuffle');
       $v_view_policy = $request->getStr('viewPolicy');
       $v_projects = $request->getArr('projects');
 
       if ($is_new) {
         $poll->setMethod($request->getInt('method'));
       }
 
       if (!strlen($v_question)) {
         $e_question = pht('Required');
         $errors[] = pht('You must ask a poll question.');
       } else {
         $e_question = null;
       }
 
       if ($is_new) {
         $responses = array_filter($responses);
         if (empty($responses)) {
           $errors[] = pht('You must offer at least one response.');
           $e_response = pht('Required');
         } else {
           $e_response = null;
         }
       }
 
       $xactions = array();
       $template = id(new PhabricatorSlowvoteTransaction());
 
       $xactions[] = id(clone $template)
         ->setTransactionType(PhabricatorSlowvoteTransaction::TYPE_QUESTION)
         ->setNewValue($v_question);
 
       $xactions[] = id(clone $template)
         ->setTransactionType(PhabricatorSlowvoteTransaction::TYPE_DESCRIPTION)
         ->setNewValue($v_description);
 
       $xactions[] = id(clone $template)
         ->setTransactionType(PhabricatorSlowvoteTransaction::TYPE_RESPONSES)
         ->setNewValue($v_responses);
 
       $xactions[] = id(clone $template)
         ->setTransactionType(PhabricatorSlowvoteTransaction::TYPE_SHUFFLE)
         ->setNewValue($v_shuffle);
 
       $xactions[] = id(clone $template)
         ->setTransactionType(PhabricatorTransactions::TYPE_VIEW_POLICY)
         ->setNewValue($v_view_policy);
 
       if (empty($errors)) {
         $proj_edge_type = PhabricatorEdgeConfig::TYPE_OBJECT_HAS_PROJECT;
         $xactions[] = id(new PhabricatorSlowvoteTransaction())
           ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
           ->setMetadataValue('edge:type', $proj_edge_type)
           ->setNewValue(array('=' => array_fuse($v_projects)));
 
         $editor = id(new PhabricatorSlowvoteEditor())
           ->setActor($user)
           ->setContinueOnNoEffect(true)
           ->setContentSourceFromRequest($request);
 
         $xactions = $editor->applyTransactions($poll, $xactions);
 
         if ($is_new) {
           $poll->save();
 
           foreach ($responses as $response) {
             $option = new PhabricatorSlowvoteOption();
             $option->setName($response);
             $option->setPollID($poll->getID());
             $option->save();
           }
         }
 
         return id(new AphrontRedirectResponse())
           ->setURI('/V'.$poll->getID());
       } else {
         $poll->setViewPolicy($v_view_policy);
       }
     }
 
     $instructions =
       phutil_tag(
         'p',
         array(
           'class' => 'aphront-form-instructions',
         ),
         pht('Resolve issues and build consensus through '.
           'protracted deliberation.'));
 
     if ($v_projects) {
       $project_handles = $this->loadViewerHandles($v_projects);
     } else {
       $project_handles = array();
     }
 
     $form = id(new AphrontFormView())
       ->setUser($user)
       ->appendChild($instructions)
       ->appendChild(
         id(new AphrontFormTextAreaControl())
           ->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_SHORT)
           ->setLabel(pht('Question'))
           ->setName('question')
           ->setValue($v_question)
           ->setError($e_question))
       ->appendChild(
         id(new PhabricatorRemarkupControl())
           ->setLabel(pht('Description'))
           ->setName('description')
           ->setValue($v_description))
       ->appendChild(
         id(new AphrontFormTokenizerControl())
           ->setLabel(pht('Projects'))
           ->setName('projects')
           ->setValue($project_handles)
           ->setDatasource('/typeahead/common/projects/'));
 
     if ($is_new) {
       for ($ii = 0; $ii < 10; $ii++) {
         $n = ($ii + 1);
         $response = id(new AphrontFormTextControl())
           ->setLabel(pht('Response %d', $n))
           ->setName('response[]')
           ->setValue(idx($responses, $ii, ''));
 
         if ($ii == 0) {
           $response->setError($e_response);
         }
 
         $form->appendChild($response);
       }
     }
 
     $poll_type_options = array(
       PhabricatorSlowvotePoll::METHOD_PLURALITY =>
         pht('Plurality (Single Choice)'),
       PhabricatorSlowvotePoll::METHOD_APPROVAL  =>
         pht('Approval (Multiple Choice)'),
     );
 
     $response_type_options = array(
       PhabricatorSlowvotePoll::RESPONSES_VISIBLE
         => pht('Allow anyone to see the responses'),
       PhabricatorSlowvotePoll::RESPONSES_VOTERS
         => pht('Require a vote to see the responses'),
       PhabricatorSlowvotePoll::RESPONSES_OWNER
         => pht('Only I can see the responses'),
     );
 
     if ($is_new) {
       $form->appendChild(
         id(new AphrontFormSelectControl())
           ->setLabel(pht('Vote Type'))
           ->setName('method')
           ->setValue($poll->getMethod())
           ->setOptions($poll_type_options));
     } else {
       $form->appendChild(
         id(new AphrontFormStaticControl())
           ->setLabel(pht('Vote Type'))
           ->setValue(idx($poll_type_options, $poll->getMethod())));
     }
 
     if ($is_new) {
       $title = pht('Create Slowvote');
       $button = pht('Create');
       $cancel_uri = $this->getApplicationURI();
     } else {
       $title = pht('Edit %s', 'V'.$poll->getID());
       $button = pht('Save Changes');
       $cancel_uri = '/V'.$poll->getID();
     }
 
     $policies = id(new PhabricatorPolicyQuery())
       ->setViewer($user)
       ->setObject($poll)
       ->execute();
 
     $form
       ->appendChild(
         id(new AphrontFormSelectControl())
           ->setLabel(pht('Responses'))
           ->setName('responses')
           ->setValue($v_responses)
           ->setOptions($response_type_options))
       ->appendChild(
         id(new AphrontFormCheckboxControl())
           ->setLabel(pht('Shuffle'))
           ->addCheckbox(
             'shuffle',
             1,
             pht('Show choices in random order.'),
             $v_shuffle))
       ->appendChild(
         id(new AphrontFormPolicyControl())
           ->setUser($user)
           ->setName('viewPolicy')
           ->setPolicyObject($poll)
           ->setPolicies($policies)
           ->setCapability(PhabricatorPolicyCapability::CAN_VIEW))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue($button)
           ->addCancelButton($cancel_uri));
 
     $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView());
     $crumbs->addTextCrumb($title);
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText($title)
       ->setFormErrors($errors)
       ->setForm($form);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $form_box,
       ),
       array(
         'title' => $title,
       ));
   }
 
 }
diff --git a/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php b/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
index dbca09df92..97da2e345f 100644
--- a/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
+++ b/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
@@ -1,195 +1,191 @@
 <?php
 
-/**
- * @group slowvote
- */
 final class PhabricatorSlowvotePollController
   extends PhabricatorSlowvoteController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $poll = id(new PhabricatorSlowvoteQuery())
       ->setViewer($user)
       ->withIDs(array($this->id))
       ->needOptions(true)
       ->needChoices(true)
       ->needViewerChoices(true)
       ->executeOne();
     if (!$poll) {
       return new Aphront404Response();
     }
 
     $poll_view = id(new SlowvoteEmbedView())
       ->setHeadless(true)
       ->setUser($user)
       ->setPoll($poll);
 
     if ($request->isAjax()) {
       return id(new AphrontAjaxResponse())
         ->setContent(
           array(
             'pollID' => $poll->getID(),
             'contentHTML' => $poll_view->render(),
           ));
     }
 
     $header_icon = $poll->getIsClosed() ? 'fa-ban' : 'fa-circle-o';
     $header_name = $poll->getIsClosed() ? pht('Closed') : pht('Open');
     $header_color = $poll->getIsClosed() ? 'dark' : 'bluegrey';
 
     $header = id(new PHUIHeaderView())
       ->setHeader($poll->getQuestion())
       ->setUser($user)
       ->setStatus($header_icon, $header_color, $header_name)
       ->setPolicyObject($poll);
 
     $actions = $this->buildActionView($poll);
     $properties = $this->buildPropertyView($poll, $actions);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb('V'.$poll->getID());
 
     $xactions = $this->buildTransactions($poll);
     $add_comment = $this->buildCommentForm($poll);
 
     $object_box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->addPropertyList($properties);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $object_box,
         phutil_tag(
           'div',
           array(
             'class' => 'mlt mml mmr',
           ),
           $poll_view),
         $xactions,
         $add_comment,
       ),
       array(
         'title' => 'V'.$poll->getID().' '.$poll->getQuestion(),
         'pageObjects' => array($poll->getPHID()),
       ));
   }
 
   private function buildActionView(PhabricatorSlowvotePoll $poll) {
     $viewer = $this->getRequest()->getUser();
 
     $view = id(new PhabricatorActionListView())
       ->setUser($viewer)
       ->setObject($poll);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $poll,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $is_closed = $poll->getIsClosed();
     $close_poll_text = $is_closed ? pht('Reopen Poll') : pht('Close Poll');
     $close_poll_icon = $is_closed ? 'fa-play-circle-o' : 'fa-ban';
 
     $view->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Edit Poll'))
         ->setIcon('fa-pencil')
         ->setHref($this->getApplicationURI('edit/'.$poll->getID().'/'))
         ->setDisabled(!$can_edit)
         ->setWorkflow(!$can_edit));
 
     $view->addAction(
       id(new PhabricatorActionView())
         ->setName($close_poll_text)
         ->setIcon($close_poll_icon)
         ->setHref($this->getApplicationURI('close/'.$poll->getID().'/'))
         ->setDisabled(!$can_edit)
         ->setWorkflow(true));
 
     return $view;
   }
 
   private function buildPropertyView(
     PhabricatorSlowvotePoll $poll,
     PhabricatorActionListView $actions) {
 
     $viewer = $this->getRequest()->getUser();
 
     $view = id(new PHUIPropertyListView())
       ->setUser($viewer)
       ->setObject($poll)
       ->setActionList($actions);
 
     $view->invokeWillRenderEvent();
 
     if (strlen($poll->getDescription())) {
       $view->addTextContent(
         $output = PhabricatorMarkupEngine::renderOneObject(
           id(new PhabricatorMarkupOneOff())->setContent(
             $poll->getDescription()),
           'default',
           $viewer));
     }
 
     return $view;
   }
 
   private function buildTransactions(PhabricatorSlowvotePoll $poll) {
     $viewer = $this->getRequest()->getUser();
 
     $xactions = id(new PhabricatorSlowvoteTransactionQuery())
       ->setViewer($viewer)
       ->withObjectPHIDs(array($poll->getPHID()))
       ->execute();
 
     $engine = id(new PhabricatorMarkupEngine())
       ->setViewer($viewer);
     foreach ($xactions as $xaction) {
       if ($xaction->getComment()) {
         $engine->addObject(
           $xaction->getComment(),
           PhabricatorApplicationTransactionComment::MARKUP_FIELD_COMMENT);
       }
     }
     $engine->process();
 
     $timeline = id(new PhabricatorApplicationTransactionView())
       ->setUser($viewer)
       ->setObjectPHID($poll->getPHID())
       ->setTransactions($xactions)
       ->setMarkupEngine($engine);
 
     return $timeline;
   }
 
   private function buildCommentForm(PhabricatorSlowvotePoll $poll) {
     $viewer = $this->getRequest()->getUser();
 
     $is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
 
     $add_comment_header = $is_serious
       ? pht('Add Comment')
       : pht('Enter Deliberations');
 
     $draft = PhabricatorDraft::newFromUserAndKey($viewer, $poll->getPHID());
 
     return id(new PhabricatorApplicationTransactionCommentView())
       ->setUser($viewer)
       ->setObjectPHID($poll->getPHID())
       ->setDraft($draft)
       ->setHeaderText($add_comment_header)
       ->setAction($this->getApplicationURI('/comment/'.$poll->getID().'/'))
       ->setSubmitButtonName(pht('Add Comment'));
-
   }
 
 }
diff --git a/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php
index d1d10cd00e..2443519eeb 100644
--- a/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php
+++ b/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php
@@ -1,115 +1,108 @@
 <?php
 
-/**
- * @group slowvote
- */
 final class PhabricatorSlowvoteVoteController
   extends PhabricatorSlowvoteController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $poll = id(new PhabricatorSlowvoteQuery())
       ->setViewer($user)
       ->withIDs(array($this->id))
       ->needOptions(true)
       ->needViewerChoices(true)
       ->executeOne();
     if (!$poll) {
       return new Aphront404Response();
     }
     if ($poll->getIsClosed()) {
       return new Aphront400Response();
     }
 
     $options = $poll->getOptions();
     $user_choices = $poll->getViewerChoices($user);
 
     $old_votes = mpull($user_choices, null, 'getOptionID');
 
     if ($request->isAjax()) {
       $vote = $request->getInt('vote');
       $votes = array_keys($old_votes);
       $votes = array_fuse($votes, $votes);
 
       if ($poll->getMethod() == PhabricatorSlowvotePoll::METHOD_PLURALITY) {
         if (idx($votes, $vote, false)) {
           $votes = array();
         } else {
           $votes = array($vote);
         }
       } else {
         if (idx($votes, $vote, false)) {
           unset($votes[$vote]);
         } else {
           $votes[$vote] = $vote;
         }
       }
 
       $this->updateVotes($user, $poll, $old_votes, $votes);
 
       $updated_choices = id(new PhabricatorSlowvoteChoice())->loadAllWhere(
         'pollID = %d AND authorPHID = %s',
         $poll->getID(),
         $user->getPHID());
 
       $embed = id(new SlowvoteEmbedView())
         ->setPoll($poll)
         ->setOptions($options)
         ->setViewerChoices($updated_choices);
 
       return id(new AphrontAjaxResponse())
         ->setContent(array(
           'pollID' => $poll->getID(),
           'contentHTML' => $embed->render()));
     }
 
     if (!$request->isFormPost()) {
       return id(new Aphront404Response());
     }
 
     $votes = $request->getArr('vote');
     $votes = array_fuse($votes, $votes);
 
     $this->updateVotes($user, $poll, $old_votes, $votes);
 
     return id(new AphrontRedirectResponse())->setURI('/V'.$poll->getID());
-
   }
 
   private function updateVotes($user, $poll, $old_votes, $votes) {
-
     if (!empty($votes) && count($votes) > 1 &&
         $poll->getMethod() == PhabricatorSlowvotePoll::METHOD_PLURALITY) {
       return id(new Aphront400Response());
     }
 
     foreach ($old_votes as $old_vote) {
       if (!idx($votes, $old_vote->getOptionID(), false)) {
         $old_vote->delete();
       }
     }
 
     foreach ($votes as $vote) {
       if (idx($old_votes, $vote, false)) {
         continue;
       }
 
       id(new PhabricatorSlowvoteChoice())
         ->setAuthorPHID($user->getPHID())
         ->setPollID($poll->getID())
         ->setOptionID($vote)
         ->save();
     }
-
   }
 
-
 }
diff --git a/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php b/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php
index e69f5eeb39..81204aecd7 100644
--- a/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php
+++ b/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php
@@ -1,189 +1,186 @@
 <?php
 
-/**
- * @group slowvote
- */
 final class PhabricatorSlowvoteQuery
   extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $ids;
   private $phids;
   private $authorPHIDs;
   private $withVotesByViewer;
   private $isClosed;
 
   private $needOptions;
   private $needChoices;
   private $needViewerChoices;
 
   public function withIDs($ids) {
     $this->ids = $ids;
     return $this;
   }
 
   public function withPHIDs($phids) {
     $this->phids = $phids;
     return $this;
   }
 
   public function withAuthorPHIDs($author_phids) {
     $this->authorPHIDs = $author_phids;
     return $this;
   }
 
   public function withVotesByViewer($with_vote) {
     $this->withVotesByViewer = $with_vote;
     return $this;
   }
 
   public function withIsClosed($with_closed) {
     $this->isClosed = $with_closed;
     return $this;
   }
 
   public function needOptions($need_options) {
     $this->needOptions = $need_options;
     return $this;
   }
 
   public function needChoices($need_choices) {
     $this->needChoices = $need_choices;
     return $this;
   }
 
   public function needViewerChoices($need_viewer_choices) {
     $this->needViewerChoices = $need_viewer_choices;
     return $this;
   }
 
   public function loadPage() {
     $table = new PhabricatorSlowvotePoll();
     $conn_r = $table->establishConnection('r');
 
     $data = queryfx_all(
       $conn_r,
       'SELECT p.* FROM %T p %Q %Q %Q %Q',
       $table->getTableName(),
       $this->buildJoinsClause($conn_r),
       $this->buildWhereClause($conn_r),
       $this->buildOrderClause($conn_r),
       $this->buildLimitClause($conn_r));
 
     return $table->loadAllFromArray($data);
   }
 
   public function willFilterPage(array $polls) {
     assert_instances_of($polls, 'PhabricatorSlowvotePoll');
 
     $ids = mpull($polls, 'getID');
     $viewer = $this->getViewer();
 
     if ($this->needOptions) {
       $options = id(new PhabricatorSlowvoteOption())->loadAllWhere(
         'pollID IN (%Ld)',
         $ids);
 
       $options = mgroup($options, 'getPollID');
       foreach ($polls as $poll) {
         $poll->attachOptions(idx($options, $poll->getID(), array()));
       }
     }
 
     if ($this->needChoices) {
       $choices = id(new PhabricatorSlowvoteChoice())->loadAllWhere(
         'pollID IN (%Ld)',
         $ids);
 
       $choices = mgroup($choices, 'getPollID');
       foreach ($polls as $poll) {
         $poll->attachChoices(idx($choices, $poll->getID(), array()));
       }
 
       // If we need the viewer's choices, we can just fill them from the data
       // we already loaded.
       if ($this->needViewerChoices) {
         foreach ($polls as $poll) {
           $poll->attachViewerChoices(
             $viewer,
             idx(
               mgroup($poll->getChoices(), 'getAuthorPHID'),
               $viewer->getPHID(),
               array()));
         }
       }
     } else if ($this->needViewerChoices) {
       $choices = id(new PhabricatorSlowvoteChoice())->loadAllWhere(
         'pollID IN (%Ld) AND authorPHID = %s',
         $ids,
         $viewer->getPHID());
 
       $choices = mgroup($choices, 'getPollID');
       foreach ($polls as $poll) {
         $poll->attachViewerChoices(
           $viewer,
           idx($choices, $poll->getID(), array()));
       }
     }
 
     return $polls;
   }
 
   private function buildWhereClause(AphrontDatabaseConnection $conn_r) {
     $where = array();
 
     if ($this->ids) {
       $where[] = qsprintf(
         $conn_r,
         'p.id IN (%Ld)',
         $this->ids);
     }
 
     if ($this->phids) {
       $where[] = qsprintf(
         $conn_r,
         'p.phid IN (%Ls)',
         $this->phids);
     }
 
     if ($this->authorPHIDs) {
       $where[] = qsprintf(
         $conn_r,
         'p.authorPHID IN (%Ls)',
         $this->authorPHIDs);
     }
 
     if ($this->isClosed !== null) {
       $where[] = qsprintf(
         $conn_r,
         'p.isClosed = %d',
         (int)$this->isClosed);
     }
 
     $where[] = $this->buildPagingClause($conn_r);
     return $this->formatWhereClause($where);
   }
 
   private function buildJoinsClause(AphrontDatabaseConnection $conn_r) {
     $joins = array();
 
     if ($this->withVotesByViewer) {
       $joins[] = qsprintf(
         $conn_r,
         'JOIN %T vv ON vv.pollID = p.id AND vv.authorPHID = %s',
         id(new PhabricatorSlowvoteChoice())->getTableName(),
         $this->getViewer()->getPHID());
     }
 
     return implode(' ', $joins);
   }
 
   protected function getPagingColumn() {
     return 'p.id';
   }
 
 
   public function getQueryApplicationClass() {
     return 'PhabricatorApplicationSlowvote';
   }
 
 }
diff --git a/src/applications/slowvote/remarkup/SlowvoteRemarkupRule.php b/src/applications/slowvote/remarkup/SlowvoteRemarkupRule.php
index ad734e3cde..5551d4b91e 100644
--- a/src/applications/slowvote/remarkup/SlowvoteRemarkupRule.php
+++ b/src/applications/slowvote/remarkup/SlowvoteRemarkupRule.php
@@ -1,35 +1,31 @@
 <?php
 
-/**
- * @group slowvote
- */
-final class SlowvoteRemarkupRule
-  extends PhabricatorRemarkupRuleObject {
+final class SlowvoteRemarkupRule extends PhabricatorRemarkupRuleObject {
 
   protected function getObjectNamePrefix() {
     return 'V';
   }
 
   protected function loadObjects(array $ids) {
     $viewer = $this->getEngine()->getConfig('viewer');
 
     return id(new PhabricatorSlowvoteQuery())
       ->setViewer($viewer)
       ->withIDs($ids)
       ->needOptions(true)
       ->needChoices(true)
       ->needViewerChoices(true)
       ->execute();
   }
 
   protected function renderObjectEmbed($object, $handle, $options) {
     $viewer = $this->getEngine()->getConfig('viewer');
 
     $embed = id(new SlowvoteEmbedView())
       ->setUser($viewer)
       ->setPoll($object);
 
     return $embed;
   }
 
 }
diff --git a/src/applications/slowvote/storage/PhabricatorSlowvoteChoice.php b/src/applications/slowvote/storage/PhabricatorSlowvoteChoice.php
index 14cea8707f..3afaf910f5 100644
--- a/src/applications/slowvote/storage/PhabricatorSlowvoteChoice.php
+++ b/src/applications/slowvote/storage/PhabricatorSlowvoteChoice.php
@@ -1,12 +1,9 @@
 <?php
 
-/**
- * @group slowvote
- */
 final class PhabricatorSlowvoteChoice extends PhabricatorSlowvoteDAO {
 
   protected $pollID;
   protected $optionID;
   protected $authorPHID;
 
 }
diff --git a/src/applications/slowvote/storage/PhabricatorSlowvoteComment.php b/src/applications/slowvote/storage/PhabricatorSlowvoteComment.php
index b72c99df01..bca8351a16 100644
--- a/src/applications/slowvote/storage/PhabricatorSlowvoteComment.php
+++ b/src/applications/slowvote/storage/PhabricatorSlowvoteComment.php
@@ -1,12 +1,9 @@
 <?php
 
-/**
- * @group slowvote
- */
 final class PhabricatorSlowvoteComment extends PhabricatorSlowvoteDAO {
 
   protected $pollID;
   protected $authorPHID;
   protected $commentText;
 
 }
diff --git a/src/applications/slowvote/storage/PhabricatorSlowvoteDAO.php b/src/applications/slowvote/storage/PhabricatorSlowvoteDAO.php
index e77f362226..ab3a7a9de5 100644
--- a/src/applications/slowvote/storage/PhabricatorSlowvoteDAO.php
+++ b/src/applications/slowvote/storage/PhabricatorSlowvoteDAO.php
@@ -1,12 +1,9 @@
 <?php
 
-/**
- * @group slowvote
- */
 abstract class PhabricatorSlowvoteDAO extends PhabricatorLiskDAO {
 
   public function getApplicationName() {
     return 'slowvote';
   }
 
 }
diff --git a/src/applications/slowvote/storage/PhabricatorSlowvoteOption.php b/src/applications/slowvote/storage/PhabricatorSlowvoteOption.php
index cb1c3feea1..6bd2c60139 100644
--- a/src/applications/slowvote/storage/PhabricatorSlowvoteOption.php
+++ b/src/applications/slowvote/storage/PhabricatorSlowvoteOption.php
@@ -1,12 +1,8 @@
 <?php
 
-/**
- * @group slowvote
- */
 final class PhabricatorSlowvoteOption extends PhabricatorSlowvoteDAO {
 
   protected $pollID;
   protected $name;
 
-
 }
diff --git a/src/applications/slowvote/storage/PhabricatorSlowvotePoll.php b/src/applications/slowvote/storage/PhabricatorSlowvotePoll.php
index 9de418f937..ce931eb6ea 100644
--- a/src/applications/slowvote/storage/PhabricatorSlowvotePoll.php
+++ b/src/applications/slowvote/storage/PhabricatorSlowvotePoll.php
@@ -1,147 +1,144 @@
 <?php
 
-/**
- * @group slowvote
- */
 final class PhabricatorSlowvotePoll extends PhabricatorSlowvoteDAO
   implements
     PhabricatorPolicyInterface,
     PhabricatorSubscribableInterface,
     PhabricatorFlaggableInterface,
     PhabricatorTokenReceiverInterface,
     PhabricatorProjectInterface {
 
   const RESPONSES_VISIBLE = 0;
   const RESPONSES_VOTERS  = 1;
   const RESPONSES_OWNER   = 2;
 
   const METHOD_PLURALITY  = 0;
   const METHOD_APPROVAL   = 1;
 
   protected $question;
   protected $description;
   protected $authorPHID;
   protected $responseVisibility;
   protected $shuffle;
   protected $method;
   protected $viewPolicy;
   protected $isClosed = 0;
 
   private $options = self::ATTACHABLE;
   private $choices = self::ATTACHABLE;
   private $viewerChoices = self::ATTACHABLE;
 
   public static function initializeNewPoll(PhabricatorUser $actor) {
     $app = id(new PhabricatorApplicationQuery())
       ->setViewer($actor)
       ->withClasses(array('PhabricatorApplicationSlowvote'))
       ->executeOne();
 
     $view_policy = $app->getPolicy(
       PhabricatorSlowvoteCapabilityDefaultView::CAPABILITY);
 
     return id(new PhabricatorSlowvotePoll())
       ->setAuthorPHID($actor->getPHID())
       ->setViewPolicy($view_policy);
   }
 
   public function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
       PhabricatorSlowvotePHIDTypePoll::TYPECONST);
   }
 
   public function getOptions() {
     return $this->assertAttached($this->options);
   }
 
   public function attachOptions(array $options) {
     assert_instances_of($options, 'PhabricatorSlowvoteOption');
     $this->options = $options;
     return $this;
   }
 
   public function getChoices() {
     return $this->assertAttached($this->choices);
   }
 
   public function attachChoices(array $choices) {
     assert_instances_of($choices, 'PhabricatorSlowvoteChoice');
     $this->choices = $choices;
     return $this;
   }
 
   public function getViewerChoices(PhabricatorUser $viewer) {
     return $this->assertAttachedKey($this->viewerChoices, $viewer->getPHID());
   }
 
   public function attachViewerChoices(PhabricatorUser $viewer, array $choices) {
     if ($this->viewerChoices === self::ATTACHABLE) {
       $this->viewerChoices = array();
     }
     assert_instances_of($choices, 'PhabricatorSlowvoteChoice');
     $this->viewerChoices[$viewer->getPHID()] = $choices;
     return $this;
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
     );
   }
 
   public function getPolicy($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         return $this->viewPolicy;
       case PhabricatorPolicyCapability::CAN_EDIT:
         return PhabricatorPolicies::POLICY_NOONE;
     }
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return ($viewer->getPHID() == $this->getAuthorPHID());
   }
 
   public function describeAutomaticCapability($capability) {
     return pht(
       'The author of a poll can always view and edit it.');
   }
 
 
 
 /* -(  PhabricatorSubscribableInterface  )----------------------------------- */
 
 
   public function isAutomaticallySubscribed($phid) {
     return ($phid == $this->getAuthorPHID());
   }
 
   public function shouldShowSubscribersProperty() {
     return true;
   }
 
   public function shouldAllowSubscription($phid) {
     return true;
   }
 
 
 /* -(  PhabricatorTokenReceiverInterface  )---------------------------------- */
 
 
   public function getUsersToNotifyOfTokenGiven() {
     return array($this->getAuthorPHID());
   }
 
 
 }
diff --git a/src/applications/slowvote/view/SlowvoteEmbedView.php b/src/applications/slowvote/view/SlowvoteEmbedView.php
index 6e18e4b3ca..4222079f99 100644
--- a/src/applications/slowvote/view/SlowvoteEmbedView.php
+++ b/src/applications/slowvote/view/SlowvoteEmbedView.php
@@ -1,362 +1,359 @@
 <?php
 
-/**
- * @group slowvote
- */
 final class SlowvoteEmbedView extends AphrontView {
 
   private $poll;
   private $handles;
   private $headless;
 
   public function setHeadless($headless) {
     $this->headless = $headless;
     return $this;
   }
 
   public function setPoll(PhabricatorSlowvotePoll $poll) {
     $this->poll = $poll;
     return $this;
   }
 
   public function getPoll() {
     return $this->poll;
   }
 
   public function render() {
     if (!$this->poll) {
       throw new Exception('Call setPoll() before render()!');
     }
 
     $poll = $this->poll;
 
     $phids = array();
     foreach ($poll->getChoices() as $choice) {
       $phids[] = $choice->getAuthorPHID();
     }
     $phids[] = $poll->getAuthorPHID();
 
     $this->handles = id(new PhabricatorHandleQuery())
       ->setViewer($this->getUser())
       ->withPHIDs($phids)
       ->execute();
 
     $options = $poll->getOptions();
 
     if ($poll->getShuffle()) {
       shuffle($options);
     }
 
     require_celerity_resource('phabricator-slowvote-css');
     require_celerity_resource('javelin-behavior-slowvote-embed');
 
     $config = array(
       'pollID' => $poll->getID());
     Javelin::initBehavior('slowvote-embed', $config);
 
     $user_choices = $poll->getViewerChoices($this->getUser());
     $user_choices = mpull($user_choices, 'getOptionID', 'getOptionID');
 
     $out = array();
     foreach ($options as $option) {
       $is_selected = isset($user_choices[$option->getID()]);
       $out[] = $this->renderLabel($option, $is_selected);
     }
 
     $link_to_slowvote = phutil_tag(
       'a',
       array(
         'href' => '/V'.$poll->getID()
       ),
       $poll->getQuestion());
 
     if ($this->headless) {
       $header = null;
     } else {
       $header = phutil_tag(
         'div',
         array(
           'class' => 'slowvote-header',
         ),
         phutil_tag(
           'div',
           array(
             'class' => 'slowvote-header-content',
           ),
           array(
             'V'.$poll->getID(),
             ' ',
             $link_to_slowvote)));
 
       $description = null;
       if ($poll->getDescription()) {
         $description = PhabricatorMarkupEngine::renderOneObject(
           id(new PhabricatorMarkupOneOff())->setContent(
             $poll->getDescription()),
           'default',
           $this->getUser());
         $description = phutil_tag(
           'div',
           array(
             'class' => 'slowvote-description',
           ),
           $description);
       }
 
       $header = array(
         $header,
         $description);
     }
 
     $vis = $poll->getResponseVisibility();
     if ($this->areResultsVisible()) {
       if ($vis == PhabricatorSlowvotePoll::RESPONSES_OWNER) {
         $quip = pht('Only you can see the results.');
       } else {
         $quip = pht('Voting improves cardiovascular endurance.');
       }
     } else if ($vis == PhabricatorSlowvotePoll::RESPONSES_VOTERS) {
       $quip = pht('You must vote to see the results.');
     } else if ($vis == PhabricatorSlowvotePoll::RESPONSES_OWNER) {
       $quip = pht('Only the author can see the results.');
     }
 
     $hint = phutil_tag(
       'span',
       array(
         'class' => 'slowvote-hint',
       ),
       $quip);
 
     if ($poll->getIsClosed()) {
       $submit = null;
     } else {
       $submit = phutil_tag(
         'div',
         array(
           'class' => 'slowvote-footer',
         ),
         phutil_tag(
           'div',
           array(
             'class' => 'slowvote-footer-content',
           ),
           array(
             $hint,
             phutil_tag(
               'button',
               array(
               ),
               pht('Engage in Deliberations')),
           )));
     }
 
     $body = phabricator_form(
       $this->getUser(),
       array(
         'action'  => '/vote/'.$poll->getID().'/',
         'method'  => 'POST',
         'class'   => 'slowvote-body',
       ),
       array(
         phutil_tag(
           'div',
           array(
             'class' => 'slowvote-body-content',
           ),
           $out),
         $submit,
       ));
 
     return javelin_tag(
       'div',
       array(
         'class' => 'slowvote-embed',
         'sigil' => 'slowvote-embed',
         'meta' => array(
           'pollID' => $poll->getID()
         )
       ),
       array($header, $body));
   }
 
   private function renderLabel(PhabricatorSlowvoteOption $option, $selected) {
     $classes = array();
     $classes[] = 'slowvote-option-label';
 
     $status = $this->renderStatus($option);
     $voters = $this->renderVoters($option);
 
     return phutil_tag(
       'div',
       array(
         'class' => 'slowvote-option-label-group',
       ),
       array(
         phutil_tag(
           'label',
           array(
             'class' => implode(' ', $classes),
           ),
           array(
             phutil_tag(
               'div',
               array(
                 'class' => 'slowvote-control-offset',
               ),
               $option->getName()),
             $this->renderBar($option),
             phutil_tag(
               'div',
               array(
                 'class' => 'slowvote-above-the-bar',
               ),
               array(
                 $this->renderControl($option, $selected),
               )),
           )),
         $status,
         $voters,
       ));
   }
 
   private function renderBar(PhabricatorSlowvoteOption $option) {
     if (!$this->areResultsVisible()) {
       return null;
     }
 
     $poll = $this->getPoll();
 
     $choices = mgroup($poll->getChoices(), 'getOptionID');
     $choices = count(idx($choices, $option->getID(), array()));
     $count = count(mgroup($poll->getChoices(), 'getAuthorPHID'));
 
     return phutil_tag(
       'div',
       array(
         'class' => 'slowvote-bar',
         'style' => sprintf(
           'width: %.1f%%;',
           $count ? 100 * ($choices / $count) : 0),
       ),
       array(
         phutil_tag(
           'div',
           array(
             'class' => 'slowvote-control-offset',
           ),
           $option->getName()),
       ));
   }
 
   private function renderControl(PhabricatorSlowvoteOption $option, $selected) {
     $types = array(
       PhabricatorSlowvotePoll::METHOD_PLURALITY => 'radio',
       PhabricatorSlowvotePoll::METHOD_APPROVAL => 'checkbox',
     );
 
     $closed = $this->getPoll()->getIsClosed();
 
     return phutil_tag(
       'input',
       array(
         'type' => idx($types, $this->getPoll()->getMethod()),
         'name' => 'vote[]',
         'value' => $option->getID(),
         'checked' => ($selected ? 'checked' : null),
         'disabled' => ($closed ? 'disabled' : null),
       ));
   }
 
   private function renderVoters(PhabricatorSlowvoteOption $option) {
     if (!$this->areResultsVisible()) {
       return null;
     }
 
     $poll = $this->getPoll();
 
     $choices = mgroup($poll->getChoices(), 'getOptionID');
     $choices = idx($choices, $option->getID(), array());
 
     if (!$choices) {
       return null;
     }
 
     $handles = $this->handles;
     $authors = mpull($choices, 'getAuthorPHID', 'getAuthorPHID');
 
     $viewer_phid = $this->getUser()->getPHID();
 
     // Put the viewer first if they've voted for this option.
     $authors = array_select_keys($authors, array($viewer_phid))
              + $authors;
 
     $voters = array();
     foreach ($authors as $author_phid) {
       $handle = $handles[$author_phid];
 
       $voters[] = javelin_tag(
         'div',
         array(
           'class' => 'slowvote-voter',
           'style' => 'background-image: url('.$handle->getImageURI().')',
           'sigil' => 'has-tooltip',
           'meta' => array(
             'tip' => $handle->getName(),
           ),
         ));
     }
 
     return phutil_tag(
       'div',
       array(
         'class' => 'slowvote-voters',
       ),
       $voters);
   }
 
   private function renderStatus(PhabricatorSlowvoteOption $option) {
     if (!$this->areResultsVisible()) {
       return null;
     }
 
     $poll = $this->getPoll();
 
     $choices = mgroup($poll->getChoices(), 'getOptionID');
     $choices = count(idx($choices, $option->getID(), array()));
     $count = count(mgroup($poll->getChoices(), 'getAuthorPHID'));
 
     $percent = sprintf('%d%%', $count ? 100 * $choices / $count : 0);
 
     switch ($poll->getMethod()) {
       case PhabricatorSlowvotePoll::METHOD_PLURALITY:
         $status = pht('%s (%d / %d)', $percent, $choices, $count);
         break;
       case PhabricatorSlowvotePoll::METHOD_APPROVAL:
         $status = pht('%s Approval (%d / %d)', $percent, $choices, $count);
         break;
     }
 
     return phutil_tag(
       'div',
       array(
         'class' => 'slowvote-status',
       ),
       $status);
   }
 
   private function areResultsVisible() {
     $poll = $this->getPoll();
 
     $vis = $poll->getResponseVisibility();
     if ($vis == PhabricatorSlowvotePoll::RESPONSES_VISIBLE) {
       return true;
     } else if ($vis == PhabricatorSlowvotePoll::RESPONSES_OWNER) {
       return ($poll->getAuthorPHID() == $this->getUser()->getPHID());
     } else {
       $choices = mgroup($poll->getChoices(), 'getAuthorPHID');
       return (bool)idx($choices, $this->getUser()->getPHID());
     }
   }
 
 }
diff --git a/src/docs/contributor/css_coding_standards.diviner b/src/docs/contributor/css_coding_standards.diviner
index 09b9998f90..795d0952f6 100644
--- a/src/docs/contributor/css_coding_standards.diviner
+++ b/src/docs/contributor/css_coding_standards.diviner
@@ -1,89 +1,89 @@
 @title CSS Coding Standards
 @group standards
 
 This document describes CSS features and coding standards for Phabricator.
 
 = Overview =
 
 This document describes technical and style guidelines for writing CSS in
 Phabricator.
 
 Phabricator has a limited CSS preprocessor. This document describes the features
 it makes available.
 
 = Z-Indexes =
 
 You should put all `z-index` rules in `z-index.css`, and keep them sorted. The
 goal is to make indexes relatively manageable and reduce the escalation of the
 Great Z-Index War where all indexes grow without bound in an endless arms race.
 
 = Color Variables =
 
 Phabricator's preprocessor provides some standard color variables. You can
 reference these with `{$color}`. For example:
 
   span.critical {
     color: {$red};
   }
 
 You can find a list of all available colors in the **UIExamples** application.
 
 = Printable Rules =
 
 If you preface a rule with `!print`, it will be transformed into a print rule
 and activated when the user is printing the page or viewing a printable version
 of the page:
 
   lang=css
   !print div.menu {
     display: none;
   }
 
 Specifically, this directive causes two copies of the rule to be written out.
 The output will look something like this:
 
   lang=css
   .printable div.menu {
     display: none;
   }
 
   @media print {
     div.menu {
       display: none;
     }
   }
 
-The former will activate when users look at the printable versions of pages,
-by adding `__print__` to the URI. The latter will be activated in print contexts
+The former will activate when users look at the printable versions of pages, by
+adding `__print__` to the URI. The latter will be activated in print contexts
 by the media query.
 
 = Device Rules =
 
-Phabricator's environment defines several device classes which can be used
-to adjust behavior responsively. In particular:
+Phabricator's environment defines several device classes which can be used to
+adjust behavior responsively. In particular:
 
   lang=css
   .device-phone {
     /* Smallest breakpoint, usually for phones. */
   }
 
   .device-tablet {
     /* Middle breakpoint, usually for tablets. */
   }
 
   .device-desktop {
     /* Largest breakpoint, usually for desktops. */
   }
 
 Since many rules are specific to handheld devices, the `.device` class selects
 either tablets or phones:
 
   .device {
     /* Phone or tablet (not desktop). */
   }
 
 = Image Inlining =
 
 Phabricator's CSS preprocessor automatically inlines images which are less than
 32KB using `data:` URIs. This is primarily useful for gradients or textures
 which are small and difficult to sprite.
diff --git a/src/docs/contributor/darkconsole.diviner b/src/docs/contributor/darkconsole.diviner
index 3a15c0eb02..5d67435ca5 100644
--- a/src/docs/contributor/darkconsole.diviner
+++ b/src/docs/contributor/darkconsole.diviner
@@ -1,60 +1,60 @@
 @title Using DarkConsole
 @group developer
 
 Enabling and using the built-in debugging console.
 
 = Overview =
 
 DarkConsole is a debugging console built into Phabricator which exposes
 configuration, performance and error information. It can help you detect,
 understand and resolve bugs and performance problems in Phabricator
 applications.
 
-DarkConsole was originally implemented as part of the Facebook Lite site;
-its name is a bit of play on that (and a reference to the dark color palette
-its design uses).
+DarkConsole was originally implemented as part of the Facebook Lite site; its
+name is a bit of play on that (and a reference to the dark color palette its
+design uses).
 
 = Warning =
 
 Because DarkConsole exposes some configuration and debugging information, it is
 disabled by default (and **you should not enable it in production**). It has
 some simple safeguards to prevent leaking credential information, but enabling
 it in production may compromise the integrity of an install.
 
 = Enabling DarkConsole =
 
 You enable DarkConsole in your configuration, by setting `darkconsole.enabled`
-to `true`, and then turning it on in `Settings` -> `Display Preferences`.
-Once DarkConsole is enabled, you can show or hide it by pressing ##`## on your
+to `true`, and then turning it on in `Settings` -> `Display Preferences`. Once
+DarkConsole is enabled, you can show or hide it by pressing ##`## on your
 keyboard.
 
 Since the setting is not available to logged-out users, you can also set
 `darkconsole.always-on` if you need to access DarkConsole on logged-out pages.
 
 DarkConsole has a number of tabs, each of which is powered by a "plugin". You
 can use them to access different debugging and performance features.
 
 = Plugin: Error Log =
 
 The "Error Log" plugin shows errors that occurred while generating the page,
 similar to the httpd ##error.log##. You can send information to the error log
 explicitly with the @{function@libphutil:phlog} function.
 
 If errors occurred, a red dot will appear on the plugin tab.
 
 = Plugin: Request =
 
 The "Request" plugin shows information about the HTTP request the server
 received, and the server itself.
 
 = Plugin: Services =
 
 The "Services" plugin lists calls a page made to external services, like
 MySQL and the command line.
 
 = Plugin: XHProf =
 
 The "XHProf" plugin gives you access to the XHProf profiler. To use it, you need
 to install the corresponding PHP plugin -- see instructions in the
 @{article:Installation Guide}. Once it is installed, you can use XHProf to
 profile the runtime performance of a page.
diff --git a/src/docs/contributor/database.diviner b/src/docs/contributor/database.diviner
index 6b085039cc..273f1d273b 100644
--- a/src/docs/contributor/database.diviner
+++ b/src/docs/contributor/database.diviner
@@ -1,175 +1,175 @@
 @title Database Schema
 @group developer
 
 This document describes key components of the database schema and should answer
 questions like how to store new types of data.
 
 = Database System =
 
 Phabricator uses MySQL with InnoDB engine. The only exception is the
 `search_documentfield` table which uses MyISAM because MySQL doesn't support
 fulltext search in InnoDB.
 
 Let us know if you need to use other database system: @{article:Give Feedback!
 Get Support!}.
 
 = PHP Drivers =
 
 Phabricator supports [[ http://www.php.net/book.mysql | MySQL ]] and
 [[ http://www.php.net/book.mysqli | MySQLi ]] PHP extensions. Most installations
 use MySQL but MySQLi should work equally well.
 
 = Databases =
 
 Each Phabricator application has its own database. The names are prefixed by
 `phabricator_`. This design has two advantages:
 
 * Each database is easier to comprehend and to maintain.
 * We don't do cross-database joins so each database can live on its own machine
   which is useful for load-balancing.
 
 = Connections =
 
 Phabricator specifies if it will use any opened connection just for reading or
 also for writing. This allows opening write connections to master and read
 connections to slave in master/slave replication. It is useful for
 load-balancing.
 
 = Tables =
 
 Each table name is prefixed by its application. For example, Differential
 revisions are stored in database `phabricator_differential` and table
 `differential_revision`. This duplicity allows easy recognition of the table in
 DarkConsole (see @{article:Using DarkConsole}) and other places.
 
 The exception is tables which share the same schema over different databases
 such as `edge`.
 
 We use lower-case table names with words separated by underscores. The reason is
 that MySQL can be configured (with `lower_case_table_names`) to lower-case the
 table names anyway.
 
 = Column Names =
 
 Phabricator uses camelCase names for columns. The main advantage is that they
 directly map to properties in PHP classes.
 
 Don't use MySQL reserved words (such as `order`) for column names.
 
 = Data Types =
 
 Phabricator uses `int unsigned` columns for storing dates instead of `date` or
 `datetime`. We don't need to care about time-zones in both MySQL and PHP because
 of it. The other reason is that PHP internally uses numbers for storing dates.
 
 Phabricator uses UTF-8 encoding for storing all text data. We use
 `utf8_general_ci` collation for free-text and `utf8_bin` for identifiers.
 
 We don't use the `enum` data type because each change to the list of possible
 values requires altering the table (which is slow with big tables). We use
 numbers (or short strings in some cases) mapped to PHP constants instead.
 
 = JSON =
 
 Some data don't require structured access - you don't need to filter or order by
 them. We store these data as text fields in JSON format. This approach has
 several advantages:
 
 * If we decide to add another unstructured field then we don't need to alter the
   table (which is slow for big tables in MySQL).
 * Table structure is not cluttered by fields which could be unused most of the
   time.
 
 An example of such usage can be found in column
 `differential_diffproperty.data`.
 
 = Primary Keys =
 
 Most tables have auto-increment column named `id`. However creating such column
 is not required for tables which are not usually directly referenced (such as
 tables expressing M:N relations). Example of such table is
 `differential_relationship`.
 
 = Indexes =
 
 Create all indexes necessary for fast query execution in most cases. Don't
 create indexes which are not used. You can analyze queries @{article:Using
 DarkConsole}.
 
 Older MySQL versions are not able to use indexes for tuple search:
 `(a, b) IN ((%s, %d), (%s, %d))`. Use `AND` and `OR` instead:
 `((a = %s AND b = %d) OR (a = %s AND b = %d))`.
 
 = Foreign Keys =
 
 We don't use InnoDB's foreign keys because our application is so great that
 no inconsistencies can arise. It will just slow us down.
 
 = PHIDs =
 
 Each globally referencable object in Phabricator has its associated PHID
 (Phabricator ID) which serves as a global identifier. We use PHIDs for
 referencing data in different databases.
 
 We use both autoincrementing IDs and global PHIDs because each is useful in
 different contexts. Autoincrementing IDs are chronologically ordered and allow
 us to construct short, human-readable object names (like D2258) and URIs. Global
 PHIDs allow us to represent relationships between different types of objects in
 a homogenous way.
 
 For example, the concept of "subscribers" is more powerfully done with PHIDs
-because we could theoretically have users, projects, teams, and more all
-as "subscribers" of other objects. Using an ID column we would need to add a
+because we could theoretically have users, projects, teams, and more all as
+"subscribers" of other objects. Using an ID column we would need to add a
 "type" column to avoid ID collision; using PHIDs does not require this
 additional column.
 
 = Transactions =
 
 Transactional code should be written using transactions. Example of such code is
 inserting multiple records where one doesn't make sense without the other or
 selecting data later used for update. See chapter in @{class:LiskDAO}.
 
 = Advanced Features =
 
 We don't use MySQL advanced features such as triggers, stored procedures or
 events because we like expressing the application logic in PHP more than in SQL.
 Some of these features (especially triggers) can also cause big confusion.
 
 Avoiding these advanced features is also good for supporting other database
 systems (which we don't support anyway).
 
 = Schema Denormalization =
 
 Phabricator uses schema denormalization for performance reasons sparingly. Try
 to avoid it if possible.
 
 = Changing the Schema =
 
 There are three simple steps to update the schema:
 
 # Create a `.sql` file in `resources/sql/patches/`. This file should:
- - Contain the approprate MySQL commands to update the schema.
- - Be named as `YYYYMMDD.patchname.ext`. For example, `20130217.example.sql`.
- - Use `${NAMESPACE}` rather than `phabricator` for database names.
- - Use `COLLATE utf8_bin` for any columns that are to be used as identifiers,
-such as PHID columns. Otherwise, use `COLLATE utf8_general_ci`.
- - Name all indexes so it is possible to delete them later.
+  - Contain the approprate MySQL commands to update the schema.
+  - Be named as `YYYYMMDD.patchname.ext`. For example, `20130217.example.sql`.
+  - Use `${NAMESPACE}` rather than `phabricator` for database names.
+  - Use `COLLATE utf8_bin` for any columns that are to be used as identifiers,
+    such as PHID columns. Otherwise, use `COLLATE utf8_general_ci`.
+   - Name all indexes so it is possible to delete them later.
 # Edit `src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php` and
-add your patch to @{method@phabricator:PhabricatorBuiltinPatchList::getPatches}.
+  add your patch to @{method@phabricator:PhabricatorBuiltinPatchList::getPatches}.
 # Run `bin/storage upgrade`.
 
 It is also possible to create more complex patches in PHP for data migration
 (due to schema changes or otherwise.) However, the schema changes themselves
 should be done in separate `.sql` files. Order can be guaranteed by editing
 `src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php`
 appropriately.
 
 See the
 [[https://secure.phabricator.com/rPb39175342dc5bee0c2246b05fa277e76a7e96ed3
 | commit adding policy storage for Paste ]] for a reasonable example of the code
 changes.
 
 = See Also =
 
 * @{class:LiskDAO}
 * @{class:PhabricatorPHID}
diff --git a/src/docs/contributor/phabricator_code_layout.diviner b/src/docs/contributor/phabricator_code_layout.diviner
index db86f5e4d4..b4e7eb5cbc 100644
--- a/src/docs/contributor/phabricator_code_layout.diviner
+++ b/src/docs/contributor/phabricator_code_layout.diviner
@@ -1,115 +1,115 @@
 @title Phabricator Code Layout
 @group developer
 
 Guide to Phabricator code layout, including how URI mapping works through
 application class and subdirectory organization best practices.
 
 = URI Mapping =
 
 When a user visits a Phabricator URI, the Phabricator infrastructure parses
 that URI with a regular expression to determine what controller class to load.
 For now, that regular expression is hard-coded inside the
 @{class:AphrontDefaultApplicationConfiguration} within the ##getURIMap##
 method. Use the existing entries as examples for adding your own entries.
 
 The Phabricator infrastructure knows where a given controller class lives on
 disk from a cache file the Arcanist phutil mapper generates. This mapping
 should be updated whenever new classes or files are added:
 
   arc liberate /path/to/phabricator/src
 
 Finally, a given controller class will map to an application which will have
 most of its code in standardized subdirectories and classes.
 
 = Best Practice Class and Subdirectory Organization =
 
 Suppose you were working on the application ##Derp##.
 
   phabricator/src/applications/derp/
 
 If ##Derp## were as simple as possible, it would have one subdirectory:
 
   phabricator/src/applications/derp/controller/
 
 containing the file ##DerpController.php## with the class
 
  - ##DerpController##: minimally implements a ##processRequest()## method
    which returns some @{class:AphrontResponse} object. The class would probably
    extend @{class:PhabricatorController}.
 
 If ##Derp## were (relatively) complex, one could reasonably expect to see
 the following directory layout:
 
   phabricator/src/applications/derp/conduit/
   phabricator/src/applications/derp/constants/
   phabricator/src/applications/derp/controller/
   phabricator/src/applications/derp/editor/
   phabricator/src/applications/derp/exception/
   phabricator/src/applications/derp/query/
   phabricator/src/applications/derp/replyhandler/
   phabricator/src/applications/derp/storage/
   phabricator/src/applications/derp/view/
 
 (The following two folders are also likely to be included for JavaScript and
 CSS respectively. However, static resources are largely outside the scope of
 this document. See @{article:Adding New CSS and JS}.)
 
   phabricator/webroot/rsrc/js/application/derp/
   phabricator/webroot/rsrc/css/application/derp/
 
 These directories under ##phabricator/src/applications/derp/## represent
 the basic set of class types from which most Phabrictor applications are
 assembled. Each would contain a class file. For ##Derp##, these classes could be
 something like:
 
  - **DerpConstants**: constants used in the ##Derp## application.
  - **DerpController**: business logic providing functionality for a given
    URI. Typically, controllers load data via Storage or Query classes, then
    present the data to the user via one or more View classes.
  - **DerpEditor**:  business logic for workflows that change one or more
    Storage objects. Editor classes are only necessary for particularly
    complicated edits and should be used pragmatically versus Storage objects.
  - **DerpException**: exceptions used in the ##Derp## application.
  - **DerpQuery**: query one or more storage objects for pertinent ##Derp##
-   application data.  @{class:PhabricatorOffsetPagedQuery} is particularly
+   application data. @{class:PhabricatorOffsetPagedQuery} is particularly
    handy for pagination and works well with @{class:AphrontPagerView}.
  - **DerpReplyHandler**: business logic from any configured email interactions
    users can have with the ##Derp## application.
  - **DerpStorage**: storage objects for the ##Derp## application. Typically
    there is a base class which extends @{class:PhabricatorLiskDAO} to configure
    application-wide storage settings like the application (thus database) name.
    Reading more about the @{class:LiskDAO} is highly recommended.
  - **DerpView**: view objects for the ##Derp## application. Typically these
    extend @{class:AphrontView}.
  - **ConduitAPI_derp_Method**: provides any and all ##Derp## application
    functionality that is accessible over Conduit.
 
 However, it is likely that ##Derp## is even more complex, and rather than
 containing one class, each directory has several classes. A typical example
 happens around the CRUD of an object:
 
  - **DerpBaseController**: typically extends @{class:PhabricatorController},
    implements ##buildStandardPageResponse## with the ##Derp## application name
    and other ##Derp##-specific meta-data, and contains any controller-specific
    functionality used throughout the ##Derp## application.
  - **DerpDeleteController**: typically extends ##DerpBaseController## and
    presents a confirmation dialogue to the user about deleting a ##Derp##.
  - **DerpEditController**: typically extends ##DerpBaseController## and
    presents a form to create and edit ##Derps##. Most likely uses
    @{class:AphrontFormView} and various ##AphrontFormXControl## classes such as
    @{class:AphrontFormTextControl} to create the form.
  - **DerpListController**: typically extends ##DerpBaseController## and displays
    a set of one or more ##Derps##. Might use @{class:AphrontTableView} to create
    a table of ##Derps##.
  - **DerpViewController**: typically extends ##DerpBaseController## and displays
    a single ##Derp##.
 
 Some especially awesome directories might have a ##__tests__## subdirectory
 containing all pertinent unit test code for the class.
 
 = Next Steps =
 
  - Learn about @{article:Adding New CSS and JS}; or
  - learn about the @{class:LiskDAO}; or
  - learn about @{article:Writing Unit Tests}; or
  - learn how to contribute (see @{article:Contributor Introduction}).
diff --git a/src/docs/contributor/using_edges.diviner b/src/docs/contributor/using_edges.diviner
index c607b1f9ea..89d07f4c2f 100644
--- a/src/docs/contributor/using_edges.diviner
+++ b/src/docs/contributor/using_edges.diviner
@@ -1,31 +1,31 @@
 @title Using Edges
 @group developer
 
 Guide to the Edges infrastructure.
 
 = Overview =
 
-Edges are a generic way of storing a relationship between two objects (like
-a Task and its attached files). If you are familiar with the Facebook
-associations framework, Phabricator Edges are substantially similar.
+Edges are a generic way of storing a relationship between two objects (like a
+Task and its attached files). If you are familiar with the Facebook associations
+framework, Phabricator Edges are substantially similar.
 
 An edge is defined by a source PHID (the edge origin), a destination PHID
 (the edge destination) and an edge type (which describes the relationship,
 like "is subscribed to" or "has attached file").
 
 Every edge is directional, and stored alongside the source object. Some edges
 are configured to automatically write an inverse edge, effectively building
 a bidirectional relationship. The strength of storing relationships like this
 is that they work when databases are partitioned or sharded.
 
 = Reading Edges =
 
 You can load edges with @{class:PhabricatorEdgeQuery}.
 
 = Writing Edges =
 
 You can edit edges with @{class:PhabricatorEdgeEditor}.
 
 = Edges and Lisk =
 
 @{class:PhabricatorLiskDAO} includes some builtin support for edges.
diff --git a/src/docs/flavor/things_you_should_do_soon.diviner b/src/docs/flavor/things_you_should_do_soon.diviner
index e1d960fd5e..1953d7777f 100644
--- a/src/docs/flavor/things_you_should_do_soon.diviner
+++ b/src/docs/flavor/things_you_should_do_soon.diviner
@@ -1,17 +1,17 @@
 @title Things You Should Do Soon
 @group sundry
 
-Describes things you should start thinking about soon, because scaling will
-be easier if you put a plan in place.
+Describes things you should start thinking about soon, because scaling will be
+easier if you put a plan in place.
 
 = Overview =
 
 Stop! Don't do any of this yet. Go do @{article:Things You Should Do Now} first.
 
 Then you can come back and read about these things. These are basically some
 problems you'll probably eventually encounter when building a web application
 that might be good to start thinking about now.
 
 = Things You Should Do Soon =
 
   - @{article:Things You Should Do Soon: Static Resources}
diff --git a/src/docs/tech/celerity.diviner b/src/docs/tech/celerity.diviner
index f9bb7ab875..d864f1b437 100644
--- a/src/docs/tech/celerity.diviner
+++ b/src/docs/tech/celerity.diviner
@@ -1,63 +1,62 @@
 @title Celerity Technical Documentation
 @group celerity
 
 Technical overview of the Celerity system.
 
 = Overview =
 
 Celerity is a static resource (CSS and JS) management system, which handles:
 
   - Keeping track of which resources a page needs.
   - Generating URIs for the browser to access resources.
   - Managing dependencies between resources.
   - Packaging resources into fewer HTTP requests for performance.
   - Preprocessing resources (e.g., stripping comments and whitespace).
   - Delivering resources and managing resource cache lifetimes.
   - Interfacing with the client to manage resources.
 
 Celerity is an outgrowth of the //Haste// system at Facebook. You can find more
 information about Celerity here:
 
   - @{article:Things You Should Do Soon: Static Resources} describes the history
     and context of the system and the problems it solves.
   - @{article:Adding New CSS and JS} provides a developer guide to using
     Celerity.
 
 = Class Relationships =
 
 Celerity's primary API is @{function:require_celerity_resource}, which marks a
 resource for inclusion when a response is rendered (e.g., when the HTML page is
 generated, or when the response to an Ajax request is built). For instance, if
 you use a CSS class like "widget-view", you must ensure the appropriate CSS is
 included by calling ##require_celerity_resource('widget-view-css')## (or
 similar), at your use site.
 
 This function uses @{class:CelerityAPI} to access the active
 @{class:CelerityStaticResourceResponse} and tells it that it needs to include
 the resource later, when the response actually gets built. (This layer of
 indirection provides future-proofing against certain complex situations Facebook
 eventually encountered).
 
 When the time comes to render the response, the page renderer uses
 @{class:CelerityAPI} to access the active
 @{class:CelerityStaticResourceResponse} and requests that it render out
 appropriate references to CSS and JS resources. It uses
 @{class:CelerityResourceMap} to determine the dependencies for the requested
 resources (so you only have to explicitly include what you're actually using,
 and not all of its dependencies) and any packaging rules (so it may be able to
 generate fewer resource requests, improving performance). It then generates
 ##<script />## and ##<link />## references to these resources.
 
 These references point at ##/res/## URIs, which are handled by
 @{class:CelerityResourceController}. It responds to these requests and delivers
 the relevant resources and packages, managing cache lifetimes and handling any
 neessary preprocessing. It uses @{class:CelerityResourceMap} to locate resources
 and read packaging rules.
 
-The dependency and packaging maps are generated by
-##bin/celerity map##, which updates
-##resources/celerity/map.php##..
+The dependency and packaging maps are generated by ##bin/celerity map##,
+which updates ##resources/celerity/map.php##.
 
 @{class:CelerityStaticResourceResponse} also manages some Javelin information,
 and @{function:celerity_generate_unique_node_id} uses this metadata to provide
 a better uniqueness guarantee when generating unique node IDs.
diff --git a/src/docs/user/userguide/events.diviner b/src/docs/user/userguide/events.diviner
index 7c3e79b8dc..292be9ec45 100644
--- a/src/docs/user/userguide/events.diviner
+++ b/src/docs/user/userguide/events.diviner
@@ -1,364 +1,364 @@
 @title Events User Guide: Installing Event Listeners
 @group userguide
 
 Using Phabricator event listeners to customize behavior.
 
 = Overview =
 
 Phabricator and Arcanist allow you to install custom runtime event listeners
 which can react to certain things happening (like a Maniphest Task being edited
 or a user creating a new Differential Revision) and run custom code to perform
 logging, synchronize with other systems, or modify workflows.
 
 These listeners are PHP classes which you install beside Phabricator or
 Arcanist, and which Phabricator loads at runtime and runs in-process. They
 require somewhat more effort upfront than simple configuration switches, but are
 the most direct and powerful way to respond to events.
 
 = Installing Event Listeners (Phabicator) =
 
 To install event listeners in Phabricator, follow these steps:
 
   - Write a listener class which extends @{class@libphutil:PhutilEventListener}.
   - Add it to a libphutil library, or create a new library (for instructions,
     see @{article:libphutil Libraries User Guide}.
   - Configure Phabricator to load the library by adding it to `load-libraries`
     in the Phabricator config.
   - Configure Phabricator to install the event listener by adding the class
     name to `events.listeners` in the Phabricator config.
 
 You can verify your listener is registered in the "Events" tab of DarkConsole.
 It should appear at the top under "Registered Event Listeners". You can also
 see any events the page emitted there. For details on DarkConsole, see
 @{article:Using DarkConsole}.
 
 = Installing Event Listeners (Arcanist) =
 
 To install event listeners in Arcanist, follow these steps:
 
   - Write a listener class which extends @{class@libphutil:PhutilEventListener}.
   - Add it to a libphutil library, or create a new library (for instructions,
     see @{article:libphutil Libraries User Guide}.
   - Configure Phabricator to load the library by adding it to `load`
     in the Arcanist config (e.g., `.arcconfig`, or user/global config).
   - Configure Arcanist to install the event listener by adding the class
     name to `events.listeners` in the Arcanist config.
 
 You can verify your listener is registered by running any `arc` command with
 `--trace`. You should see output indicating your class was registered as an
 event listener.
 
 = Example Listener =
 
 Phabricator includes an example event listener,
 @{class:PhabricatorExampleEventListener}, which may be useful as a starting
 point in developing your own listeners. This listener listens for a test
 event that is emitted by the script `scripts/util/emit_test_event.php`.
 
 If you run this script normally, it should output something like this:
 
   $ ./scripts/util/emit_test_event.php
   Emitting event...
   Done.
 
 This is because there are no listeners for the event, so nothing reacts to it
 when it is emitted. You can add the example listener by either adding it to
 your `events.listeners` configuration or with the `--listen` command-line flag:
 
   $ ./scripts/util/emit_test_event.php --listen PhabricatorExampleEventListener
   Installing 'PhabricatorExampleEventListener'...
   Emitting event...
   PhabricatorExampleEventListener got test event at 1341344566
   Done.
 
 This time, the listener was installed and had its callback invoked when the
 test event was emitted.
 
 = Available Events =
 
 You can find a list of all Phabricator events in @{class:PhabricatorEventType}.
 
 == All Events ==
 
 The special constant `PhutilEventType::TYPE_ALL` will let you listen for all
 events. Normally, you want to listen only to specific events, but if you're
 writing a generic handler you can listen to all events with this constant
 rather than by enumerating each event.
 
 == Arcanist Events ==
 
 Arcanist event constants are listed in @{class@arcanist:ArcanistEventType}.
 
 All Arcanist events have this data available:
 
   - `workflow` The active @{class@arcanist:ArcanistBaseWorkflow}.
 
 == Arcanist: Commit: Will Commit SVN ==
 
 The constant for this event is `ArcanistEventType::TYPE_COMMIT_WILLCOMMITSVN`.
 
 This event is dispatched before an `svn commit` occurs and allows you to
 modify the commit message. Data available on this event:
 
   - `message` The text of the message.
 
 == Arcanist: Diff: Will Build Message ==
 
 The constant for this event is `ArcanistEventType::TYPE_DIFF_WILLBUILDMESSAGE`.
 
 This event is dispatched before an editable message is presented to the user,
 and allows you to, e.g., fill in default values for fields. Data available
 on this event:
 
   - `fields` A map of field values to be compiled into a message.
 
 == Arcanist: Diff: Was Created ==
 
 The constant for this event is `ArcanistEventType::TYPE_DIFF_WASCREATED`.
 
 This event is dispatched after a diff is created. It is currently only useful
 for collecting timing information. No data is available on this event.
 
 == Arcanist: Revision: Will Create Revision ==
 
 The constant for this event is
 `ArcanistEventType::TYPE_REVISION_WILLCREATEREVISION`.
 
 This event is dispatched before a revision is created. It allows you to modify
 fields to, e.g., edit revision titles. Data available on this event:
 
   - `specification` Parameters that will be used to invoke the
     `differential.createrevision` Conduit call.
 
 == Controller: Check Request ==
 
 The constant for this event is
 `PhabricatorEventType::TYPE_CONTROLLER_CHECKREQUEST`.
 
 This event is dispatched when controller is about to begin execution. It is
 meant for checking if the user is allowed to use the application at the moment.
 It can check if the user has performed too many operations recently, if his IP
 address is allowed or if the servers are overloaded to process the request.
 Data available on this event:
 
 - `request` Object of class @{class:AphrontRequest}.
 - `controller` Class name of the current controller.
 
 You can delegate the execution to another controller by modifying `controller`.
 
 == Maniphest: Will Edit Task ==
 
 The constant for this event is
 `PhabricatorEventType::TYPE_MANIPHEST_WILLEDITTASK`.
 
 This event is dispatched before a task is edited, and allows you to respond to
 or alter the edit. Data available on this event:
 
   - ##task## The @{class:ManiphestTask} being edited.
   - ##transactions## The list of edits (objects of class
     @{class:ManiphestTransaction}) being applied.
   - ##new## A boolean indicating if this task is being created.
   - ##mail## If this edit originates from email, the
     @{class:PhabricatorMetaMTAReceivedMail} object.
 
 This is similar to the next event (did edit task) but occurs before the edit
 begins.
 
 == Maniphest: Did Edit Task ==
 
 The constant for this event is
 `PhabricatorEventType::TYPE_MANIPHEST_DIDEDITTASK`.
 
 This event is dispatched after a task is edited, and allows you to react to the
 edit. Data available on this event:
 
   - ##task## The @{class:ManiphestTask} that was edited.
   - ##transactions## The list of edits (objects of class
     @{class:ManiphestTransaction}) that were applied.
   - ##new## A boolean indicating if this task was newly created.
   - ##mail## If this edit originates from email, the
     @{class:PhabricatorMetaMTAReceivedMail} object.
 
 This is similar to the previous event (will edit task) but occurs after the
 edit completes.
 
 == Differential: Will Mark Generated ==
 
 The constant for this event is
 `PhabricatorEventType::TYPE_DIFFERENTIAL_WILLMARKGENERATED`.
 
 This event is dispatched before Differential decides if a file is generated (and
-doesn't need to be reviewed) or not.  Data available on this event:
+doesn't need to be reviewed) or not. Data available on this event:
 
   - ##corpus## Body of the file.
   - ##is_generated## Boolean indicating if this file should be treated as
     generated.
 
 == Diffusion: Did Discover Commit ==
 
 The constant for this event is
 `PhabricatorEventType::TYPE_DIFFUSION_DIDDISCOVERCOMMIT`.
 
 This event is dispatched when the daemons discover a commit for the first time.
 This event happens very early in the pipeline, and not all commit information
 will be available yet. Data available on this event:
 
   - `commit` The @{class:PhabricatorRepositoryCommit} that was discovered.
   - `repository` The @{class:PhabricatorRepository} the commit was discovered
     in.
 
 == Diffusion: Lookup User ==
 
 The constant for this event is
 `PhabricatorEventType::TYPE_DIFFUSION_LOOKUPUSER`.
 
 This event is dispatched when the daemons are trying to link a commit to a
 Phabricator user account. You can listen for it to improve the accuracy of
 associating users with their commits.
 
 By default, Phabricator will try to find matches based on usernames, real names,
 or email addresses, but this can result in incorrect matches (e.g., if you have
 several employees with the same name) or failures to match (e.g., if someone
 changed their email address). Listening for this event allows you to intercept
 the lookup and supplement the results from another datasource.
 
 Data available on this event:
 
   - `commit` The @{class:PhabricatorRepositoryCommit} that data is being looked
     up for.
   - `query` The author or committer string being looked up. This will usually
     be something like "Abraham Lincoln <alincoln@logcabin.example.com>", but
     comes from the commit metadata so it may not be well-formatted.
   - `result` The current result from the lookup (Phabricator's best guess at
     the user PHID of the user named in the "query"). To substitute the result
     with a different result, replace this with the correct PHID in your event
     listener.
 
 Using @{class@libphutil:PhutilEmailAddress} may be helpful in parsing the query.
 
 == Edge: Will Edit Edges ==
 
 NOTE: Edge events are low-level events deep in the core. It is more difficult to
 correct implement listeners for these events than for higher-level events.
 
 The constant for this event is
 `PhabricatorEventType::TYPE_EDGE_WILLEDITEDGES`.
 
 This event is dispatched before @{class:PhabricatorEdgeEditor} makes an edge
 edit.
 
   - `id` An identifier for this edit operation.
   - `add` A list of dictionaries, each representing a new edge.
   - `rem` A list of dictionaries, each representing a removed edge.
 
 This is similar to the next event (did edit edges) but occurs before the
 edit begins.
 
 == Edge: Did Edit Edges ==
 
 The constant for this event is
 `PhabricatorEventType::TYPE_EDGE_DIDEDITEDGES`.
 
 This event is dispatched after @{class:PhabricatorEdgeEditor} makes an edge
 edit, but before it commits the transactions. Data available on this event:
 
   - `id` An identifier for this edit operation. This is the same ID as
     the one included in the corresponding "will edit edges" event.
   - `add` A list of dictionaries, each representing a new edge.
   - `rem` A list of dictionaries, each representing a removed edge.
 
 This is similar to the previous event (will edit edges) but occurs after the
 edit completes.
 
 == Search: Did Update Index ==
 
 The constant for this event is
 `PhabricatorEventType::TYPE_SEARCH_DIDUPDATEINDEX`.
 
 This event is dispatched from the Search application's indexing engine, after
 it indexes a document. It allows you to publish search-like indexes into other
 systems.
 
 Note that this event happens after the update is fully complete: you can not
 prevent or modify the update. Further, the event may fire significantly later
 in real time than the update, as indexing may occur in the background. You
 should use other events if you need guarantees about when the event executes.
 
 Finally, this event may fire more than once for a single update. For example,
 if the search indexes are rebuilt, this event will fire on objects which have
 not actually changed.
 
 So, good use cases for event listeners are:
 
   - Updating secondary search indexes.
 
 Bad use cases are:
 
   - Editing the object or document.
   - Anything with side effects, like sending email.
 
 Data available on this event:
 
   - `phid` The PHID of the updated object.
   - `object` The object which was updated (like a @{class:ManiphesTask}).
   - `document` The @{class:PhabricatorSearchAbstractDocument} which was indexed.
     This contains an abstract representation of the object, and may be useful
     in populating secondary indexes because it provides a uniform API.
 
 == Test: Did Run Test ==
 
 The constant for this event is
 `PhabricatorEventType::TYPE_TEST_DIDRUNTEST`.
 
 This is a test event for testing event listeners. See above for details.
 
 == UI: Did Render Actions ==
 
 The constant for this event is
 `PhabricatorEventType::TYPE_UI_DIDRENDERACTIONS`.
 
 This event is dispatched after a @{class:PhabricatorActionListView} is built by
 the UI. It allows you to add new actions that your application may provide, like
 "Fax this Object". Data available on this event:
 
   - `object` The object which actions are being rendered for.
   - `actions` The current list of available actions.
 
 NOTE: This event is unstable and subject to change.
 
 = Debugging Listeners =
 
 If you're having problems with your listener, try these steps:
 
   - If you're getting an error about Phabricator being unable to find the
     listener class, make sure you've added it to a libphutil library and
     configured Phabricator to load the library with `load-libraries`.
   - Make sure the listener is registered. It should appear in the "Events" tab
     of DarkConsole. If it's not there, you may have forgotten to add it to
     `events.listeners`.
   - Make sure it calls `listen()` on the right events in its `register()`
     method. If you don't listen for the events you're interested in, you
     won't get a callback.
   - Make sure the events you're listening for are actually happening. If they
     occur on a normal page they should appear in the "Events" tab of
     DarkConsole. If they occur on a POST, you could add a `phlog()`
     to the source code near the event and check your error log to make sure the
     code ran.
   - You can check if your callback is getting invoked by adding `phlog()` with
     a message and checking the error log.
   - You can try listening to `PhutilEventType::TYPE_ALL` instead of a specific
     event type to get all events, to narrow down whether problems are caused
     by the types of events you're listening to.
   - You can edit the `emit_test_event.php` script to emit other types of
     events instead, to test that your listener reacts to them properly. You
     might have to use fake data, but this gives you an easy way to test the
     at least the basics.
   - For scripts, you can run under `--trace` to see which events are emitted
     and how many handlers are listening to each event.
 
 = Next Steps =
 
 Continue by:
 
   - taking a look at @{class:PhabricatorExampleEventListener}; or
   - building a library with @{article:libphutil Libraries User Guide}.
diff --git a/src/docs/user/userguide/jump.diviner b/src/docs/user/userguide/jump.diviner
index 5910484760..f4ae81ecdf 100644
--- a/src/docs/user/userguide/jump.diviner
+++ b/src/docs/user/userguide/jump.diviner
@@ -1,29 +1,28 @@
 @title Jump Nav User Guide
 @group userguide
 
 Command reference for the jump nav.
 
 = Overview =
 
 The jump nav provides a quick way to navigate to tools and objects: just type
 a navigational command into the box and press return.
 
 = Supported Commands =
 
   - **help** - Jump to this document.
   - **T** - Jump to Maniphest.
   - **T123** - Jump to Maniphest Task 123.
   - **D** - Jump to Differential.
   - **D123** - Jump to Differential Revision 123.
   - **r** - Jump to Diffusion.
   - **rXYZ** - Jump to Diffusion Repository XYZ.
   - **rXYZabcdef** - Jump to Diffusion Commit rXYZabcdef.
   - **r <name>** - Search for repositories by name.
   - **u** - Jump to People
   - **u username** - Jump to username's Profile
   - **p** - Jump to Project
   - **p Some Project** - Jump to Project: Some Project
   - **s SymbolName** - Jump to Symbol SymbolName
-  - **task: (new title)** - Jumps to Task Creation Page with pre-filled
-    title.
+  - **task: (new title)** - Jumps to Task Creation Page with pre-filled title.
   - **(default)** - Search for input.
diff --git a/src/docs/user/userguide/owners.diviner b/src/docs/user/userguide/owners.diviner
index 23238ae943..4d4095fc39 100644
--- a/src/docs/user/userguide/owners.diviner
+++ b/src/docs/user/userguide/owners.diviner
@@ -1,30 +1,30 @@
 @title Owners Tool User Guide
 @group userguide
 
 Use Owners to define and/or monitor code you care about.
 
 = Packages =
 
 Owners tool allows you to define a code package by specifying a group of paths.
 The package can then be used to monitor the paths. For example, it can be used
 in Herald rules and in the "Related Commits" feature (see below).
 
 = Related Commits =
 
 Once the package is defined, all future commits touching any path defined in
 the package will be recorded as "Related Commits" of the package.
 
 = Commits Needing Attention =
 
 Owners tool enables the owners of the package to monitor the commits that might
 need attention. If "auditing" is enabled for a package, a related commit will
 be marked as "Needing Attention" if
 
   - it's neither authored nor reviewed by an owner of the package,
   - no revision found for the commit,
   - the commit author is not recognized, or
   - the author or the reviewer specified in the commits don't match the ones in
-  the Differential revision
+    the Differential revision
 
 The owners of the package can accept or specify concern for such commits by
 clicking the "Audit Status" link.
diff --git a/src/docs/user/userguide/remarkup.diviner b/src/docs/user/userguide/remarkup.diviner
index 7716811db3..6f5bf914e2 100644
--- a/src/docs/user/userguide/remarkup.diviner
+++ b/src/docs/user/userguide/remarkup.diviner
@@ -1,561 +1,561 @@
 @title Remarkup Reference
 @group userguide
 
 Explains how to make bold text; this makes your words louder so you can win
 arguments.
 
 = Overview =
 
 Phabricator uses a lightweight markup language called "Remarkup", similar to
 other lightweight markup languages like Markdown and Wiki markup.
 
 This document describes how to format text using Remarkup.
 
 = Quick Reference =
 
 All the syntax is explained in more detail below, but this is a quick guide to
 formatting text in Remarkup.
 
 These are inline styles, and can be applied to most text:
 
   **bold** //italic// ##monospaced## `monospaced` ~~deleted~~ __underlined__
   D123 T123 rX123           # Link to Objects
   {D123} {T123}             # Link to Objects (Full Name)
   {F123}                    # Embed Images
   {M123}                    # Embed Pholio Mock
   @username                 # Mention a User
   #project                  # Mention a Project
   [[wiki page]]             # Link to Phriction
   [[wiki page | name]]      # Named link to Phriction
   http://xyz/               # Link to web
   [[http://xyz/ | name]]    # Named link to web
   [name](http://xyz/)       # Alternate Link
 
 These are block styles, and must be separated from surrounding text by
 empty lines:
 
   = Large Header =
 
   == Smaller Header ==
 
   Also a Large Header
   ===================
 
   Also a Smaller Header
   ---------------------
 
   > Quoted Text
 
   Use "- " or "* " for bulleted lists, and "# " for numbered lists.
   Use ``` or indent two spaces for code.
   Use %%% for a literal block.
   Use | ... | ... for tables.
 
 = Basic Styling =
 
 Format **basic text styles** like this:
 
   **bold text**
   //italic text//
   ##monospaced text##
   `monospaced text`
   ~~deleted text~~
   __underlined text__
 
 Those produce **bold text**, //italic text//, ##monospaced text##,
 `monospaced text`, ~~deleted text~~, and __underlined text__, respectively.
 
 = Layout =
 
 Make **headers** like this:
 
   = Large Header =
 
   == Smaller Header ==
 
   ===== Very Small Header =====
 
   Alternate Large Header
   ======================
 
   Alternate Smaller Header
   ------------------------
 
 You can optionally omit the trailing `=` signs -- that is, these are the same:
 
   == Smaller Header ==
 
   == Smaller Header
 
 This produces headers like the ones in this document. Make sure you have an
 empty line before and after the header.
 
 Make **lists** by beginning each item with a "-" or a "*":
 
   lang=text
   - milk
   - eggs
   - bread
 
   * duck
   * duck
   * goose
 
 This produces a list like this:
 
   - milk
   - eggs
   - bread
 
 (Note that you need to put a space after the "-" or "*".)
 
 You can make numbered lists with a "#" instead of "-" or "*":
 
   # Articuno
   # Zapdos
   # Moltres
 
 You can also nest lists:
 
 ```- Body
   - Head
   - Arm
     - Elbow
     - Hand
       # Thumb
       # Index
       # Middle
       # Ring
       # Pinkie
   - Leg
     - Knee
     - Foot```
 
 ...which produces:
 
   - Body
   - Head
   - Arm
     - Elbow
     - Hand
       # Thumb
       # Index
       # Middle
       # Ring
       # Pinkie
   - Leg
     - Knee
     - Foot
 
 If you prefer, you can indent lists using multiple characters to show indent
 depth, like this:
 
 ```- Tree
 -- Branch
 --- Twig```
 
 As expected, this produces:
 
 - Tree
 -- Branch
 --- Twig
 
 You can add checkboxes to items by prefacing them with `[ ]` or `[X]`, like
 this:
 
 ```
   - [X] Preheat oven to 450 degrees.
   - [ ] Zest 35 lemons.
 ```
 
 When rendered, this produces:
 
   - [X] Preheat oven to 450 degrees.
   - [ ] Zest 35 lemons.
 
 Make **code blocks** by indenting two spaces:
 
   f(x, y);
 
 You can also use three backticks to enclose the code block:
 
   ```f(x, y);
   g(f);```
 
 You can specify a language for syntax highlighting with "lang=xxx":
 
   lang=text
   lang=html
   <a href="#">...</a>
 
 This will highlight the block using a highlighter for that language, if one is
 available (in most cases, this means you need to configure Pygments):
 
   lang=html
   <a href="#">...</a>
 
 You can also use a "COUNTEREXAMPLE" header to show that a block of code is
 bad and shouldn't be copied:
 
   lang=text
   COUNTEREXAMPLE
   function f() {
     global $$variable_variable;
   }
 
 This produces a block like this:
 
   COUNTEREXAMPLE
   function f() {
     global $$variable_variable;
   }
 
 You can use ##lines=N## to limit the vertical size of a chunk of code, and
 ##name=some_name.ext## to give it a name. For example, this:
 
   lang=text
   lang=html, name=example.html, lines=12, counterexample
   ...
 
 ...produces this:
 
   lang=html, name=example.html, lines=12, counterexample
   <p>Apple</p>
   <p>Apricot</p>
   <p>Avocado</p>
   <p>Banana</p>
   <p>Bilberry</p>
   <p>Blackberry</p>
   <p>Blackcurrant</p>
   <p>Blueberry</p>
   <p>Currant</p>
   <p>Cherry</p>
   <p>Cherimoya</p>
   <p>Clementine</p>
   <p>Date</p>
   <p>Damson</p>
   <p>Durian</p>
   <p>Eggplant</p>
   <p>Elderberry</p>
   <p>Feijoa</p>
   <p>Gooseberry</p>
   <p>Grape</p>
   <p>Grapefruit</p>
   <p>Guava</p>
   <p>Huckleberry</p>
   <p>Jackfruit</p>
   <p>Jambul</p>
   <p>Kiwi fruit</p>
   <p>Kumquat</p>
   <p>Legume</p>
   <p>Lemon</p>
   <p>Lime</p>
   <p>Lychee</p>
   <p>Mandarine</p>
   <p>Mango</p>
   <p>Mangostine</p>
   <p>Melon</p>
 
 You can also use "NOTE:", "WARNING:", or "IMPORTANT:" to call out an important
  idea.
 
 NOTE: Best practices in proton pack operation include not crossing the streams.
 
 WARNING: Crossing the streams can result in total protonic reversal!
 
 IMPORTANT: Don't cross the streams!
 
 In addition, you can use "(NOTE)", "(WARNING)", or "(IMPORTANT)" to get the
 same effect but without "(NOTE)", "(WARNING)", or "(IMPORTANT)" appearing in
 the rendered result. For example
 
 (NOTE) Dr. Egon Spengler is the best resource for additional proton pack
  questions.
 
 = Linking URIs =
 
 URIs are automatically linked: http://phabricator.org/
 
 If you have a URI with problematic characters in it, like
 "##http://comma.org/,##", you can surround it with angle brackets:
 
   <http://comma.org/,>
 
 This will force the parser to consume the whole URI: <http://comma.org/,>
 
 You can also use create named links, where you choose the displayed text. These
 work within Phabricator or on the internet at large:
 
   [[/herald/transcript/ | Herald Transcripts]]
   [[http://www.boring-legal-documents.com/ | exciting legal documents]]
 
 Markdown-style links are also supported:
 
   [Toil](http://www.trouble.com)
 
 = Linking to Objects =
 
 You can link to Differential revisions, Diffusion commits and Maniphest tasks
 by mentioning the name of an object:
 
   D123          # Link to Differential revision D123
   rX123         # Link to SVN commit 123 from the "X" repository
   rXaf3192cd5   # Link to Git commit "af3192cd5..." from the "X" repository.
                 # You must specify at least 7 characters of the hash.
   T123          # Link to Maniphest task T123
 
 You can also link directly to a comment in Maniphest and Differential:
 
   T123#4        # Link to comment #4 of T123
 
 = Embedding Objects
 
 You can also generate full-name references to some objects by using braces:
 
   {D123}        # Link to Differential revision D123 with the full name
   {T123}        # Link to Maniphest task T123 with the full name
 
 These references will also show when an object changes state (for instance, a
 task or revision is closed). Some types of objects support rich embedding.
 
 == Linking to Project Tags
 
 Projects can be linked to with the use of a hashtag (#). This works by default
 using the name of the Project (lowercase, underscored). Additionally you
 can set multiple additional hashtags by editing the Project details.
 
   #qa, #quality_assurance
 
 == Embedding Mocks (Pholio)
 
 You can embed a Pholio mock by using braces to refer to it:
 
   {M123}
 
 By default the first four images from the mock set are displayed. This behavior
 can be overridden with the **image** option. With the **image** option you can
 provide one or more image IDs to display.
 
 You can set the image (or images) to display like this:
 
   {M123, image=12345}
   {M123, image=12345 & 6789}
 
 == Embedding Pastes
 
 You can embed a Paste using braces:
 
   {P123}
 
 You can adjust the embed height with the `lines` option:
 
   {P123, lines=15}
 
 You can highlight specific lines with the `highlight` option:
 
   {P123, highlight=15}
   {P123, highlight="23-25, 31"}
 
 == Embedding Images
 
 You can embed an image or other file by using braces to refer to it:
 
   {F123}
 
 In most interfaces, you can drag-and-drop an image from your computer into the
 text area to upload and reference it.
 
 Some browsers (e.g. Chrome) support uploading an image data just by pasting them
 from clipboard into the text area.
 
 You can set file display options like this:
 
   {F123, layout=left, float, size=full, alt="a duckling"}
 
 Valid options are:
 
   - **layout** left (default), center, right, inline, link (render a link
     instead of a thumbnail for images)
   - **float** If layout is set to left or right, the image will be floated so
     text wraps around it.
   - **size** thumb (default), full
   - **name** with `layout=link` or for non-images, use this name for the link
     text
   - **width** Scale image to a specific width.
   - **height** Scale image to a specific height.
   - **alt** Provide alternate text for assistive technologies.
 
 == Embedding Countdowns
 
 You can embed a countdown by using braces:
 
   {C123}
 
 = Quoting Text =
 
 To quote text, preface it with an ">":
 
   > This is quoted text.
 
 This appears like this:
 
 > This is quoted text.
 
 = Embedding Media =
 
 If you set a configuration flag, you can embed media directly in text:
 
   - **remarkup.enable-embedded-youtube**: allows you to paste in YouTube videos
     and have them render inline.
 
 This option is disabled by default because it has security and/or
 silliness implications. Read the description in ##default.conf.php## before
 enabling it.
 
 = Image Macros =
 
 You can upload image macros (More Stuff -> Macro) which will replace text
 strings with the image you specify. For instance, you could upload an image of a
 dancing banana to create a macro named "peanutbutterjellytime", and then any
 time you type that string on a separate line it will be replaced with the image
 of a dancing banana.
 
 = Memes =
 
 You can also use image macros in the context of memes. For example, if you
 have an image macro named "grumpy", you can create a meme by doing the
 following:
 
   {meme, src = grumpy, above = toptextgoeshere, below = bottomtextgoeshere}
 
 By default, the font used to create the text for the meme is `tuffy.ttf`. For
 the more authentic feel of `impact.ttf`, you simply have to place the Impact
 TrueType font in the Phabricator subfolder `/resources/font/`. If Remarkup
 detects the presence of `impact.ttf`, it will automatically use it.
 
 = Mentioning Users =
 
 In Differential and Maniphest, you can mention another user by writing:
 
   @username
 
 When you submit your comment, this will add them as a CC on the revision or task
 if they aren't already CC'd.
 
 Icons
 =====
 
 You can add icons to comments using the `{icon ...}` syntax. For example:
 
   {icon camera}
 
 This renders: {icon camera}
 
 You can select a color for icons:
 
   {icon camera color=blue}
 
 This renders: {icon camera color=blue}
 
 For a list of available icons and colors, check the UIExamples application.
 (The icons are sourced from
 [[ http://fortawesome.github.io/Font-Awesome/ | FontAwesome ]], so you can also
 browse the collection there.)
 
 = Phriction Documents =
 
 You can link to Phriction documents with a name or path:
 
   Make sure you sign and date your [[legal/Letter of Marque and Reprisal]]!
 
 With a pipe (##|##), you can retitle the link. Use this to mislead your
 opponents:
 
   Check out these [[legal/boring_documents/ | exciting legal documents]]!
 
 = Literal Blocks =
 
 To place text in a literal block use "%%%":
 
   %%%Text that won't be processed by remarkup
   [[http://www.example.com | example]]
   %%%
 
 Remarkup will not process the text inside of literal blocks (other than to
 escape HTML and preserve line breaks).
 
 = Tables =
 
 Remarkup supports simple table syntax. For example, this:
 
   | Fruit  | Color  | Price   | Peel?
   | -----  | -----  | -----   | -----
   | Apple  | red    | `$0.93` | no
   | Banana | yellow | `$0.19` | **YES**
 
 ...produces this:
 
 | Fruit  | Color  | Price   | Peel?
 | -----  | -----  | -----   | -----
 | Apple  | red    | `$0.93` | no
 | Banana | yellow | `$0.19` | **YES**
 
 Remarkup also supports a simplified HTML table syntax. For example, this:
 
   <table>
     <tr>
       <th>Fruit</th>
       <th>Color</th>
       <th>Price</th>
       <th>Peel?</th>
     </tr>
     <tr>
       <td>Apple</td>
       <td>red</td>
       <td>`$0.93`</td>
       <td>no</td>
     </tr>
     <tr>
       <td>Banana</td>
       <td>yellow</td>
       <td>`$0.19`</td>
       <td>**YES**</td>
     </tr>
   </table>
 
 ...produces this:
 
 <table>
   <tr>
     <th>Fruit</th>
     <th>Color</th>
     <th>Price</th>
     <th>Peel?</th>
   </tr>
   <tr>
     <td>Apple</td>
     <td>red</td>
     <td>`$0.93`</td>
     <td>no</td>
   </tr>
   <tr>
     <td>Banana</td>
     <td>yellow</td>
     <td>`$0.19`</td>
     <td>**YES**</td>
   </tr>
 </table>
 
 Some general notes about this syntax:
 
   - your tags must all be properly balanced;
   - your tags must NOT include attributes (`<td>` is OK, `<td style="...">` is
     not);
   - you can use other Remarkup rules (like **bold**, //italics//, etc.) inside
     table cells.
 
 = Fullscreen Mode =
 
-Remarkup editors provide a fullscreen composition mode.  This can make it easier
+Remarkup editors provide a fullscreen composition mode. This can make it easier
 to edit large blocks of text, or improve focus by removing distractions. You can
 exit **Fullscreen** mode by clicking the button again or by pressing escape.
diff --git a/src/infrastructure/celerity/CelerityAPI.php b/src/infrastructure/celerity/CelerityAPI.php
index 4a786adbe2..d5649471af 100644
--- a/src/infrastructure/celerity/CelerityAPI.php
+++ b/src/infrastructure/celerity/CelerityAPI.php
@@ -1,20 +1,18 @@
 <?php
 
 /**
  * Indirection layer which provisions for a terrifying future where we need to
  * build multiple resource responses per page.
- *
- * @group celerity
  */
 final class CelerityAPI {
 
   private static $response;
 
   public static function getStaticResourceResponse() {
     if (empty(self::$response)) {
       self::$response = new CelerityStaticResourceResponse();
     }
     return self::$response;
   }
 
 }
diff --git a/src/infrastructure/celerity/CelerityPhabricatorResourceController.php b/src/infrastructure/celerity/CelerityPhabricatorResourceController.php
index 3f42e50c57..5a4610da84 100644
--- a/src/infrastructure/celerity/CelerityPhabricatorResourceController.php
+++ b/src/infrastructure/celerity/CelerityPhabricatorResourceController.php
@@ -1,50 +1,48 @@
 <?php
 
 /**
  * Delivers CSS and JS resources to the browser. This controller handles all
- * ##/res/## requests, and manages caching, package construction, and resource
+ * `/res/` requests, and manages caching, package construction, and resource
  * preprocessing.
- *
- * @group celerity
  */
 final class CelerityPhabricatorResourceController
   extends CelerityResourceController {
 
   private $path;
   private $hash;
   private $library;
 
   public function getCelerityResourceMap() {
     return CelerityResourceMap::getNamedInstance($this->library);
   }
 
   public function willProcessRequest(array $data) {
     $this->path = $data['path'];
     $this->hash = $data['hash'];
     $this->library = $data['library'];
   }
 
   public function processRequest() {
     // Check that the resource library exists before trying to serve resources
     // from it.
     try {
       $this->getCelerityResourceMap();
     } catch (Exception $ex) {
       return new Aphront400Response();
     }
 
     return $this->serveResource($this->path);
   }
 
   protected function buildResourceTransformer() {
     $minify_on = PhabricatorEnv::getEnvConfig('celerity.minify');
     $developer_on = PhabricatorEnv::getEnvConfig('phabricator.developer-mode');
 
     $should_minify = ($minify_on && !$developer_on);
 
     return id(new CelerityResourceTransformer())
       ->setMinify($should_minify)
       ->setCelerityMap($this->getCelerityResourceMap());
   }
 
 }
diff --git a/src/infrastructure/celerity/CelerityResourceTransformer.php b/src/infrastructure/celerity/CelerityResourceTransformer.php
index faf5ba295e..5071e43da7 100644
--- a/src/infrastructure/celerity/CelerityResourceTransformer.php
+++ b/src/infrastructure/celerity/CelerityResourceTransformer.php
@@ -1,384 +1,379 @@
 <?php
 
-/**
- * @group celerity
- */
 final class CelerityResourceTransformer {
 
   private $minify;
   private $rawURIMap;
   private $celerityMap;
   private $translateURICallback;
   private $currentPath;
 
   public function setTranslateURICallback($translate_uricallback) {
     $this->translateURICallback = $translate_uricallback;
     return $this;
   }
 
   public function setMinify($minify) {
     $this->minify = $minify;
     return $this;
   }
 
   public function setCelerityMap(CelerityResourceMap $celerity_map) {
     $this->celerityMap = $celerity_map;
     return $this;
   }
 
   public function setRawURIMap(array $raw_urimap) {
     $this->rawURIMap = $raw_urimap;
     return $this;
   }
 
   public function getRawURIMap() {
     return $this->rawURIMap;
   }
 
   /**
    * @phutil-external-symbol function jsShrink
    */
   public function transformResource($path, $data) {
     $type = self::getResourceType($path);
 
     switch ($type) {
       case 'css':
         $data = $this->replaceCSSPrintRules($path, $data);
         $data = $this->replaceCSSVariables($path, $data);
         $data = preg_replace_callback(
           '@url\s*\((\s*[\'"]?.*?)\)@s',
           nonempty(
             $this->translateURICallback,
             array($this, 'translateResourceURI')),
           $data);
         break;
     }
 
     if (!$this->minify) {
       return $data;
     }
 
     // Some resources won't survive minification (like Raphael.js), and are
     // marked so as not to be minified.
     if (strpos($data, '@'.'do-not-minify') !== false) {
       return $data;
     }
 
     switch ($type) {
       case 'css':
         // Remove comments.
         $data = preg_replace('@/\*.*?\*/@s', '', $data);
         // Remove whitespace around symbols.
         $data = preg_replace('@\s*([{}:;,])\s*@', '\1', $data);
         // Remove unnecessary semicolons.
         $data = preg_replace('@;}@', '}', $data);
         // Replace #rrggbb with #rgb when possible.
         $data = preg_replace(
           '@#([a-f0-9])\1([a-f0-9])\2([a-f0-9])\3@i',
           '#\1\2\3',
           $data);
         $data = trim($data);
         break;
       case 'js':
 
         // If `jsxmin` is available, use it. jsxmin is the Javelin minifier and
         // produces the smallest output, but is complicated to build.
         if (Filesystem::binaryExists('jsxmin')) {
           $future = new ExecFuture('jsxmin __DEV__:0');
           $future->write($data);
           list($err, $result) = $future->resolve();
           if (!$err) {
             $data = $result;
             break;
           }
         }
 
         // If `jsxmin` is not available, use `JsShrink`, which doesn't compress
         // quite as well but is always available.
         $root = dirname(phutil_get_library_root('phabricator'));
         require_once $root.'/externals/JsShrink/jsShrink.php';
         $data = jsShrink($data);
 
         break;
     }
 
     return $data;
   }
 
   public static function getResourceType($path) {
     return last(explode('.', $path));
   }
 
   public function translateResourceURI(array $matches) {
     $uri = trim($matches[1], "'\" \r\t\n");
     $tail = '';
 
     // If the resource URI has a query string or anchor, strip it off before
     // we go looking for the resource. We'll stitch it back on later. This
     // primarily affects FontAwesome.
 
     $parts = preg_split('/(?=[?#])/', $uri, 2);
     if (count($parts) == 2) {
       $uri = $parts[0];
       $tail = $parts[1];
     }
 
     $alternatives = array_unique(
       array(
         $uri,
         ltrim($uri, '/'),
       ));
 
     foreach ($alternatives as $alternative) {
       if ($this->rawURIMap !== null) {
         if (isset($this->rawURIMap[$alternative])) {
           $uri = $this->rawURIMap[$alternative];
           break;
         }
       }
 
       if ($this->celerityMap) {
         $resource_uri = $this->celerityMap->getURIForName($alternative);
         if ($resource_uri) {
           // Check if we can use a data URI for this resource. If not, just
           // use a normal Celerity URI.
           $data_uri = $this->generateDataURI($alternative);
           if ($data_uri) {
             $uri = $data_uri;
           } else {
             $uri = $resource_uri;
           }
           break;
         }
       }
     }
 
     return 'url('.$uri.$tail.')';
   }
 
   private function replaceCSSVariables($path, $data) {
     $this->currentPath = $path;
     return preg_replace_callback(
       '/{\$([^}]+)}/',
       array($this, 'replaceCSSVariable'),
       $data);
   }
 
   private function replaceCSSPrintRules($path, $data) {
     $this->currentPath = $path;
     return preg_replace_callback(
       '/!print\s+(.+?{.+?})/s',
       array($this, 'replaceCSSPrintRule'),
       $data);
   }
 
   public static function getCSSVariableMap() {
     return array(
       // Base Colors
       'red'           => '#c0392b',
       'lightred'      => '#f4dddb',
       'orange'        => '#e67e22',
       'lightorange'   => '#f7e2d4',
       'yellow'        => '#f1c40f',
       'lightyellow'   => '#fdf5d4',
       'green'         => '#139543',
       'lightgreen'    => '#d7eddf',
       'blue'          => '#2980b9',
       'lightblue'     => '#daeaf3',
       'sky'           => '#3498db',
       'lightsky'      => '#ddeef9',
       'indigo'        => '#c6539d',
       'lightindigo'   => '#f5e2ef',
       'violet'        => '#8e44ad',
       'lightviolet'   => '#ecdff1',
       'charcoal'      => '#4b4d51',
       'backdrop'      => '#c4cde0',
       'hovergrey'     => '#c5cbcf',
       'hoverblue'     => '#eceff5',
       'hoverborder'   => '#dfe1e9',
       'hoverselectedgrey' => '#bbc4ca',
       'hoverselectedblue' => '#e6e9ee',
 
       // Base Greys
       'lightgreyborder'     => '#C7CCD9',
       'greyborder'          => '#A1A6B0',
       'darkgreyborder'      => '#676A70',
       'lightgreytext'       => '#92969D',
       'greytext'            => '#74777D',
       'darkgreytext'        => '#4B4D51',
       'lightgreybackground' => '#F7F7F7',
       'greybackground'      => '#EBECEE',
       'darkgreybackground'  => '#DFE0E2',
 
       // Base Blues
       'thinblueborder'      => '#DDE8EF',
       'lightblueborder'     => '#BFCFDA',
       'blueborder'          => '#8C98B8',
       'darkblueborder'      => '#626E82',
       'lightbluebackground' => '#F8F9FC',
       'bluebackground'      => '#DAE7FF',
       'lightbluetext'       => '#8C98B8',
       'bluetext'            => '#6B748C',
       'darkbluetext'        => '#464C5C',
 
       // Base Greens
       'lightgreenborder'      => '#bfdac1',
       'greenborder'           => '#8cb89c',
       'greentext'             => '#3e6d35',
       'lightgreenbackground'  => '#e6f2e4',
 
       // Base Red
       'lightredborder'        => '#f4c6c6',
       'redborder'             => '#eb9797',
       'redtext'               => '#802b2b',
       'lightredbackground'    => '#f5e1e1',
 
       // Base Violet
       'lightvioletborder'     => '#cfbddb',
       'violetborder'          => '#b589ba',
       'violettext'            => '#603c73',
       'lightvioletbackground' => '#e9dfee',
 
       // Shades are a more muted set of our base colors
       // better suited to blending into other UIs.
 
       // Shade Red
       'sh-lightredborder'     => '#efcfcf',
       'sh-redborder'          => '#d1abab',
       'sh-redicon'            => '#c85a5a',
       'sh-redtext'            => '#a53737',
       'sh-redbackground'      => '#f7e6e6',
 
       // Shade Orange
       'sh-lightorangeborder'  => '#f8dcc3',
       'sh-orangeborder'       => '#dbb99e',
       'sh-orangeicon'         => '#e78331',
       'sh-orangetext'         => '#ba6016',
       'sh-orangebackground'   => '#fbede1',
 
       // Shade Yellow
       'sh-lightyellowborder'  => '#e9dbcd',
       'sh-yellowborder'       => '#c9b8a8',
       'sh-yellowicon'         => '#9b946e',
       'sh-yellowtext'         => '#726f56',
       'sh-yellowbackground'   => '#fdf3da',
 
       // Shade Green
       'sh-lightgreenborder'   => '#c6e6c7',
       'sh-greenborder'        => '#a0c4a1',
       'sh-greenicon'          => '#4ca74e',
       'sh-greentext'          => '#326d34',
       'sh-greenbackground'    => '#ddefdd',
 
       // Shade Blue
       'sh-lightblueborder'    => '#cfdbe3',
       'sh-blueborder'         => '#a7b5bf',
       'sh-blueicon'           => '#6b748c',
       'sh-bluetext'           => '#464c5c',
       'sh-bluebackground'     => '#dee7f8',
 
       // Shade Indigo
       'sh-lightindigoborder'  => '#f6d5ef',
       'sh-indigoborder'       => '#d5aecd',
       'sh-indigoicon'         => '#e26fcb',
       'sh-indigotext'         => '#da49be',
       'sh-indigobackground'   => '#fbeaf8',
 
       // Shade Violet
       'sh-lightvioletborder'  => '#e0d1e7',
       'sh-violetborder'       => '#bcabc5',
       'sh-violeticon'         => '#9260ad',
       'sh-violettext'         => '#69427f',
       'sh-violetbackground'   => '#efe8f3',
 
       // Shade Grey
       'sh-lightgreyborder'    => '#d8d8d8',
       'sh-greyborder'         => '#b2b2b2',
       'sh-greyicon'           => '#757575',
       'sh-greytext'           => '#555555',
       'sh-greybackground'     => '#e7e7e7',
 
       // Shade Disabled
       'sh-lightdisabledborder'  => '#e5e5e5',
       'sh-disabledborder'       => '#cbcbcb',
       'sh-disabledicon'         => '#bababa',
       'sh-disabledtext'         => '#a6a6a6',
       'sh-disabledbackground'   => '#f3f3f3',
 
     );
   }
 
 
   public function replaceCSSVariable($matches) {
     static $map;
     if (!$map) {
       $map = self::getCSSVariableMap();
     }
 
     $var_name = $matches[1];
     if (empty($map[$var_name])) {
       $path = $this->currentPath;
       throw new Exception(
         "CSS file '{$path}' has unknown variable '{$var_name}'.");
     }
 
     return $map[$var_name];
   }
 
   public function replaceCSSPrintRule($matches) {
     $rule = $matches[1];
 
     $rules = array();
     $rules[] = '.printable '.$rule;
     $rules[] = "@media print {\n  ".str_replace("\n", "\n  ", $rule)."\n}\n";
 
     return implode("\n\n", $rules);
   }
 
 
   /**
    * Attempt to generate a data URI for a resource. We'll generate a data URI
    * if the resource is a valid resource of an appropriate type, and is
    * small enough. Otherwise, this method will return `null` and we'll end up
    * using a normal URI instead.
    *
    * @param string  Resource name to attempt to generate a data URI for.
    * @return string|null Data URI, or null if we declined to generate one.
    */
   private function generateDataURI($resource_name) {
-
     $ext = last(explode('.', $resource_name));
     switch ($ext) {
       case 'png':
         $type = 'image/png';
         break;
       case 'gif':
         $type = 'image/gif';
         break;
       case 'jpg':
         $type = 'image/jpeg';
         break;
       default:
         return null;
     }
 
     // In IE8, 32KB is the maximum supported URI length.
     $maximum_data_size = (1024 * 32);
 
     $data = $this->celerityMap->getResourceDataForName($resource_name);
     if (strlen($data) >= $maximum_data_size) {
       // If the data is already too large on its own, just bail before
       // encoding it.
       return null;
     }
 
     $uri = 'data:'.$type.';base64,'.base64_encode($data);
     if (strlen($uri) >= $maximum_data_size) {
       return null;
     }
 
     return $uri;
   }
 
-
 }
diff --git a/src/infrastructure/celerity/CelerityStaticResourceResponse.php b/src/infrastructure/celerity/CelerityStaticResourceResponse.php
index 746ea9e362..8d15286ad5 100644
--- a/src/infrastructure/celerity/CelerityStaticResourceResponse.php
+++ b/src/infrastructure/celerity/CelerityStaticResourceResponse.php
@@ -1,309 +1,307 @@
 <?php
 
 /**
  * Tracks and resolves dependencies the page declares with
  * @{function:require_celerity_resource}, and then builds appropriate HTML or
  * Ajax responses.
- *
- * @group celerity
  */
 final class CelerityStaticResourceResponse {
 
   private $symbols = array();
   private $needsResolve = true;
   private $resolved;
   private $packaged;
   private $metadata = array();
   private $metadataBlock = 0;
   private $behaviors = array();
   private $hasRendered = array();
 
   public function __construct() {
     if (isset($_REQUEST['__metablock__'])) {
       $this->metadataBlock = (int)$_REQUEST['__metablock__'];
     }
   }
 
   public function addMetadata($metadata) {
     $id = count($this->metadata);
     $this->metadata[$id] = $metadata;
     return $this->metadataBlock.'_'.$id;
   }
 
   public function getMetadataBlock() {
     return $this->metadataBlock;
   }
 
   /**
    * Register a behavior for initialization. NOTE: if $config is empty,
    * a behavior will execute only once even if it is initialized multiple times.
    * If $config is nonempty, the behavior will be invoked once for each config.
    */
   public function initBehavior(
     $behavior,
     array $config = array(),
     $source_name = 'phabricator') {
 
     $this->requireResource('javelin-behavior-'.$behavior, $source_name);
 
     if (empty($this->behaviors[$behavior])) {
       $this->behaviors[$behavior] = array();
     }
 
     if ($config) {
       $this->behaviors[$behavior][] = $config;
     }
 
     return $this;
   }
 
   public function requireResource($symbol, $source_name) {
     if (isset($this->symbols[$source_name][$symbol])) {
       return $this;
     }
 
     // Verify that the resource exists.
     $map = CelerityResourceMap::getNamedInstance($source_name);
     $name = $map->getResourceNameForSymbol($symbol);
     if ($name === null) {
       throw new Exception(
         pht(
           'No resource with symbol "%s" exists in source "%s"!',
           $symbol,
           $source_name));
     }
 
     $this->symbols[$source_name][$symbol] = true;
     $this->needsResolve = true;
 
     return $this;
   }
 
   private function resolveResources() {
     if ($this->needsResolve) {
       $this->packaged = array();
       foreach ($this->symbols as $source_name => $symbols_map) {
         $symbols = array_keys($symbols_map);
 
         $map = CelerityResourceMap::getNamedInstance($source_name);
         $packaged = $map->getPackagedNamesForSymbols($symbols);
 
         $this->packaged[$source_name] = $packaged;
       }
       $this->needsResolve = false;
     }
     return $this;
   }
 
   public function renderSingleResource($symbol, $source_name) {
     $map = CelerityResourceMap::getNamedInstance($source_name);
     $packaged = $map->getPackagedNamesForSymbols(array($symbol));
     return $this->renderPackagedResources($map, $packaged);
   }
 
   public function renderResourcesOfType($type) {
     $this->resolveResources();
 
     $result = array();
     foreach ($this->packaged as $source_name => $resource_names) {
       $map = CelerityResourceMap::getNamedInstance($source_name);
 
       $resources_of_type = array();
       foreach ($resource_names as $resource_name) {
         $resource_type = $map->getResourceTypeForName($resource_name);
         if ($resource_type == $type) {
           $resources_of_type[] = $resource_name;
         }
       }
 
       $result[] = $this->renderPackagedResources($map, $resources_of_type);
     }
 
     return phutil_implode_html('', $result);
   }
 
   private function renderPackagedResources(
     CelerityResourceMap $map,
     array $resources) {
 
     $output = array();
     foreach ($resources as $name) {
       if (isset($this->hasRendered[$name])) {
         continue;
       }
       $this->hasRendered[$name] = true;
 
       $output[] = $this->renderResource($map, $name);
     }
 
     return $output;
   }
 
   private function renderResource(
     CelerityResourceMap $map,
     $name) {
 
     $uri = $this->getURI($map, $name);
     $type = $map->getResourceTypeForName($name);
 
     switch ($type) {
       case 'css':
         return phutil_tag(
           'link',
           array(
             'rel'   => 'stylesheet',
             'type'  => 'text/css',
             'href'  => $uri,
           ));
       case 'js':
         return phutil_tag(
           'script',
           array(
             'type'  => 'text/javascript',
             'src'   => $uri,
           ),
           '');
     }
 
     throw new Exception(
       pht(
         'Unable to render resource "%s", which has unknown type "%s".',
         $name,
         $type));
   }
 
   public function renderHTMLFooter() {
     $data = array();
     if ($this->metadata) {
       $json_metadata = AphrontResponse::encodeJSONForHTTPResponse(
         $this->metadata);
       $this->metadata = array();
     } else {
       $json_metadata = '{}';
     }
     // Even if there is no metadata on the page, Javelin uses the mergeData()
     // call to start dispatching the event queue.
     $data[] = 'JX.Stratcom.mergeData('.$this->metadataBlock.', '.
                                        $json_metadata.');';
 
     $onload = array();
     if ($this->behaviors) {
       $behaviors = $this->behaviors;
       $this->behaviors = array();
 
       $higher_priority_names = array(
         'refresh-csrf',
         'aphront-basic-tokenizer',
         'dark-console',
         'history-install',
       );
 
       $higher_priority_behaviors = array_select_keys(
         $behaviors,
         $higher_priority_names);
 
       foreach ($higher_priority_names as $name) {
         unset($behaviors[$name]);
       }
 
       $behavior_groups = array(
         $higher_priority_behaviors,
         $behaviors);
 
       foreach ($behavior_groups as $group) {
         if (!$group) {
           continue;
         }
         $group_json = AphrontResponse::encodeJSONForHTTPResponse(
           $group);
         $onload[] = 'JX.initBehaviors('.$group_json.')';
       }
     }
 
     if ($onload) {
       foreach ($onload as $func) {
         $data[] = 'JX.onload(function(){'.$func.'});';
       }
     }
 
     if ($data) {
       $data = implode("\n", $data);
       return self::renderInlineScript($data);
     } else {
       return '';
     }
   }
 
   public static function renderInlineScript($data) {
     if (stripos($data, '</script>') !== false) {
       throw new Exception(
         'Literal </script> is not allowed inside inline script.');
     }
     if (strpos($data, '<!') !== false) {
       throw new Exception('Literal <! is not allowed inside inline script.');
     }
     // We don't use <![CDATA[ ]]> because it is ignored by HTML parsers. We
     // would need to send the document with XHTML content type.
     return phutil_tag(
       'script',
       array('type' => 'text/javascript'),
       phutil_safe_html($data));
   }
 
   public function buildAjaxResponse($payload, $error = null) {
     $response = array(
       'error'   => $error,
       'payload' => $payload,
     );
 
     if ($this->metadata) {
       $response['javelin_metadata'] = $this->metadata;
       $this->metadata = array();
     }
 
     if ($this->behaviors) {
       $response['javelin_behaviors'] = $this->behaviors;
       $this->behaviors = array();
     }
 
     $this->resolveResources();
     $resources = array();
     foreach ($this->packaged as $source_name => $resource_names) {
       $map = CelerityResourceMap::getNamedInstance($source_name);
       foreach ($resource_names as $resource_name) {
         $resources[] = $this->getURI($map, $resource_name);
       }
     }
     if ($resources) {
       $response['javelin_resources'] = $resources;
     }
 
     return $response;
   }
 
   public function getURI(
     CelerityResourceMap $map,
     $name,
     $use_primary_domain = false) {
 
     $uri = $map->getURIForName($name);
 
     // In developer mode, we dump file modification times into the URI. When a
     // page is reloaded in the browser, any resources brought in by Ajax calls
     // do not trigger revalidation, so without this it's very difficult to get
     // changes to Ajaxed-in CSS to work (you must clear your cache or rerun
     // the map script). In production, we can assume the map script gets run
     // after changes, and safely skip this.
     if (PhabricatorEnv::getEnvConfig('phabricator.developer-mode')) {
       $mtime = $map->getModifiedTimeForName($name);
       $uri = preg_replace('@^/res/@', '/res/'.$mtime.'T/', $uri);
     }
 
     if ($use_primary_domain) {
       return PhabricatorEnv::getURI($uri);
     } else {
       return PhabricatorEnv::getCDNURI($uri);
     }
   }
 
 }
diff --git a/src/infrastructure/celerity/__tests__/CelerityResourceTransformerTestCase.php b/src/infrastructure/celerity/__tests__/CelerityResourceTransformerTestCase.php
index f23862b8d0..f6f43a1de0 100644
--- a/src/infrastructure/celerity/__tests__/CelerityResourceTransformerTestCase.php
+++ b/src/infrastructure/celerity/__tests__/CelerityResourceTransformerTestCase.php
@@ -1,37 +1,34 @@
 <?php
 
-/**
- * @group celerity
- */
 final class CelerityResourceTransformerTestCase extends PhabricatorTestCase {
 
   public function testTransformation() {
     $files = dirname(__FILE__).'/transformer/';
     foreach (Filesystem::listDirectory($files) as $file) {
       $name = basename($file);
       $data = Filesystem::readFile($files.'/'.$file);
       $parts = preg_split('/^~~~+\n/m', $data);
       $parts = array_merge($parts, array(null));
 
       list($options, $in, $expect) = $parts;
 
       $parser = new PhutilSimpleOptions();
       $options = $parser->parse($options) + array(
         'minify' => false,
         'name'   => $name,
       );
 
       $xformer = new CelerityResourceTransformer();
       $xformer->setRawURIMap(
         array(
           '/rsrc/example.png' => '/res/hash/example.png',
         ));
       $xformer->setMinify($options['minify']);
 
       $result = $xformer->transformResource($options['name'], $in);
 
       $this->assertEqual(rtrim($expect), rtrim($result), $file);
     }
   }
 
 }
diff --git a/src/infrastructure/celerity/api.php b/src/infrastructure/celerity/api.php
index 6c51f6beec..4340b57df0 100644
--- a/src/infrastructure/celerity/api.php
+++ b/src/infrastructure/celerity/api.php
@@ -1,58 +1,52 @@
 <?php
 
 /**
  * Include a CSS or JS static resource by name. This function records a
  * dependency for the current page, so when a response is generated it can be
  * included. You can call this method from any context, and it is recommended
  * you invoke it as close to the actual dependency as possible so that page
  * dependencies are minimized.
  *
  * For more information, see @{article:Adding New CSS and JS}.
  *
  * @param string Name of the celerity module to include. This is whatever you
  *               annotated as "@provides" in the file.
  * @return void
- *
- * @group celerity
  */
 function require_celerity_resource($symbol, $source_name = 'phabricator') {
   $response = CelerityAPI::getStaticResourceResponse();
   $response->requireResource($symbol, $source_name);
 }
 
 
 /**
  * Generate a node ID which is guaranteed to be unique for the current page,
  * even across Ajax requests. You should use this method to generate IDs for
  * nodes which require a uniqueness guarantee.
  *
  * @return string A string appropriate for use as an 'id' attribute on a DOM
  *                node. It is guaranteed to be unique for the current page, even
  *                if the current request is a subsequent Ajax request.
- *
- * @group celerity
  */
 function celerity_generate_unique_node_id() {
   static $uniq = 0;
   $response = CelerityAPI::getStaticResourceResponse();
   $block = $response->getMetadataBlock();
 
   return 'UQ'.$block.'_'.($uniq++);
 }
 
 
 /**
  * Get the versioned URI for a raw resource, like an image.
  *
  * @param   string  Path to the raw image.
  * @return  string  Versioned path to the image, if one is available.
- *
- * @group celerity
  */
 function celerity_get_resource_uri($resource, $source = 'phabricator') {
   $resource = ltrim($resource, '/');
 
   $map = CelerityResourceMap::getNamedInstance($source);
   $response = CelerityAPI::getStaticResourceResponse();
   return $response->getURI($map, $resource);
 }
diff --git a/src/infrastructure/daemon/bot/PhabricatorBot.php b/src/infrastructure/daemon/bot/PhabricatorBot.php
index 6738b4592e..0d6675849d 100644
--- a/src/infrastructure/daemon/bot/PhabricatorBot.php
+++ b/src/infrastructure/daemon/bot/PhabricatorBot.php
@@ -1,150 +1,148 @@
 <?php
 
 /**
  * Simple IRC bot which runs as a Phabricator daemon. Although this bot is
  * somewhat useful, it is also intended to serve as a demo of how to write
  * "system agents" which communicate with Phabricator over Conduit, so you can
  * script system interactions and integrate with other systems.
  *
  * NOTE: This is super janky and experimental right now.
- *
- * @group irc
  */
 final class PhabricatorBot extends PhabricatorDaemon {
 
   private $handlers;
 
   private $conduit;
   private $config;
   private $pollFrequency;
 
   public function run() {
     $argv = $this->getArgv();
     if (count($argv) !== 1) {
       throw new Exception('usage: PhabricatorBot <json_config_file>');
     }
 
     $json_raw = Filesystem::readFile($argv[0]);
     $config = json_decode($json_raw, true);
     if (!is_array($config)) {
       throw new Exception("File '{$argv[0]}' is not valid JSON!");
     }
 
     $nick                   = idx($config, 'nick', 'phabot');
     $handlers               = idx($config, 'handlers', array());
     $protocol_adapter_class = idx(
       $config,
       'protocol-adapter',
       'PhabricatorIRCProtocolAdapter');
     $this->pollFrequency = idx($config, 'poll-frequency', 1);
 
     $this->config = $config;
 
     foreach ($handlers as $handler) {
       $obj = newv($handler, array($this));
       $this->handlers[] = $obj;
     }
 
     $ca_bundle = idx($config, 'https.cabundle');
     if ($ca_bundle) {
       HTTPSFuture::setGlobalCABundleFromPath($ca_bundle);
     }
 
     $conduit_uri = idx($config, 'conduit.uri');
     if ($conduit_uri) {
       $conduit_user = idx($config, 'conduit.user');
       $conduit_cert = idx($config, 'conduit.cert');
 
       // Normalize the path component of the URI so users can enter the
       // domain without the "/api/" part.
       $conduit_uri = new PhutilURI($conduit_uri);
 
       $conduit_host = (string)$conduit_uri->setPath('/');
       $conduit_uri = (string)$conduit_uri->setPath('/api/');
 
       $conduit = new ConduitClient($conduit_uri);
       $response = $conduit->callMethodSynchronous(
         'conduit.connect',
         array(
           'client'            => 'PhabricatorBot',
           'clientVersion'     => '1.0',
           'clientDescription' => php_uname('n').':'.$nick,
           'host'              => $conduit_host,
           'user'              => $conduit_user,
           'certificate'       => $conduit_cert,
         ));
 
       $this->conduit = $conduit;
     }
 
     // Instantiate Protocol Adapter, for now follow same technique as
     // handler instantiation
     $this->protocolAdapter = newv($protocol_adapter_class, array());
     $this->protocolAdapter
       ->setConfig($this->config)
       ->connect();
 
     $this->runLoop();
   }
 
   public function getConfig($key, $default = null) {
     return idx($this->config, $key, $default);
   }
 
   private function runLoop() {
     do {
       $this->stillWorking();
 
       $messages = $this->protocolAdapter->getNextMessages($this->pollFrequency);
       if (count($messages) > 0) {
         foreach ($messages as $message) {
           $this->routeMessage($message);
         }
       }
 
       foreach ($this->handlers as $handler) {
         $handler->runBackgroundTasks();
       }
     } while (true);
   }
 
   public function writeMessage(PhabricatorBotMessage $message) {
     return $this->protocolAdapter->writeMessage($message);
   }
 
   private function routeMessage(PhabricatorBotMessage $message) {
     $ignore = $this->getConfig('ignore');
     if ($ignore) {
       $sender = $message->getSender();
       if ($sender && in_array($sender->getName(), $ignore)) {
         return;
       }
     }
 
     if ($message->getCommand() == 'LOG') {
       $this->log('[LOG] '.$message->getBody());
     }
 
     foreach ($this->handlers as $handler) {
       try {
         $handler->receiveMessage($message);
       } catch (Exception $ex) {
         phlog($ex);
       }
     }
   }
 
   public function getAdapter() {
     return $this->protocolAdapter;
   }
 
   public function getConduit() {
     if (empty($this->conduit)) {
       throw new Exception(
         "This bot is not configured with a Conduit uplink. Set 'conduit.uri', ".
         "'conduit.user' and 'conduit.cert' in the configuration to connect.");
     }
     return $this->conduit;
   }
 
 }
diff --git a/src/infrastructure/daemon/bot/handler/PhabricatorBotFeedNotificationHandler.php b/src/infrastructure/daemon/bot/handler/PhabricatorBotFeedNotificationHandler.php
index 81520518d9..21eadf1569 100644
--- a/src/infrastructure/daemon/bot/handler/PhabricatorBotFeedNotificationHandler.php
+++ b/src/infrastructure/daemon/bot/handler/PhabricatorBotFeedNotificationHandler.php
@@ -1,183 +1,180 @@
 <?php
 
 /**
- * Watches the feed and puts notifications into channel(s) of choice
- *
- * @group irc
+ * Watches the feed and puts notifications into channel(s) of choice.
  */
 final class PhabricatorBotFeedNotificationHandler
   extends PhabricatorBotHandler {
 
   private $startupDelay = 30;
   private $lastSeenChronoKey = 0;
 
   private $typesNeedURI = array('DREV', 'TASK');
 
   private function shouldShowStory($story) {
     $story_objectphid = $story['objectPHID'];
     $story_text = $story['text'];
 
     $show = $this->getConfig('notification.types');
 
     if ($show) {
       $obj_type = phid_get_type($story_objectphid);
       if (!in_array(strtolower($obj_type), $show)) {
         return false;
       }
     }
 
     $verbosity = $this->getConfig('notification.verbosity', 3);
 
     $verbs = array();
 
     switch ($verbosity) {
       case 2:
         $verbs[] = array(
-                     'commented',
-                     'added',
-                     'changed',
-                     'resigned',
-                     'explained',
-                     'modified',
-                     'attached',
-                     'edited',
-                     'joined',
-                     'left',
-                     'removed'
-                   );
+          'commented',
+          'added',
+          'changed',
+          'resigned',
+          'explained',
+          'modified',
+          'attached',
+          'edited',
+          'joined',
+          'left',
+          'removed',
+        );
       // fallthrough
       case 1:
         $verbs[] = array(
-                     'updated',
-                     'accepted',
-                     'requested',
-                     'planned',
-                     'claimed',
-                     'summarized',
-                     'commandeered',
-                     'assigned'
-                   );
+          'updated',
+          'accepted',
+          'requested',
+          'planned',
+          'claimed',
+          'summarized',
+          'commandeered',
+          'assigned',
+        );
       // fallthrough
       case 0:
         $verbs[] = array(
-                     'created',
-                     'closed',
-                     'raised',
-                     'committed',
-                     'abandoned',
-                     'reclaimed',
-                     'reopened',
-                     'deleted'
-                   );
-      break;
+          'created',
+          'closed',
+          'raised',
+          'committed',
+          'abandoned',
+          'reclaimed',
+          'reopened',
+          'deleted',
+        );
+        break;
 
       case 3:
       default:
         return true;
-      break;
     }
 
     $verbs = '/('.implode('|', array_mergev($verbs)).')/';
 
     if (preg_match($verbs, $story_text)) {
       return true;
     }
 
     return false;
   }
 
   public function receiveMessage(PhabricatorBotMessage $message) {
     return;
   }
 
   public function runBackgroundTasks() {
     if ($this->startupDelay > 0) {
-        // the event loop runs every 1s so delay enough to fully conenct
-        $this->startupDelay--;
+      // the event loop runs every 1s so delay enough to fully conenct
+      $this->startupDelay--;
 
-        return;
+      return;
     }
     if ($this->lastSeenChronoKey == 0) {
       // Since we only want to post notifications about new stories, skip
       // everything that's happened in the past when we start up so we'll
       // only process real-time stories.
       $latest = $this->getConduit()->callMethodSynchronous(
         'feed.query',
         array(
           'limit' => 1,
         ));
 
       foreach ($latest as $story) {
         if ($story['chronologicalKey'] > $this->lastSeenChronoKey) {
           $this->lastSeenChronoKey = $story['chronologicalKey'];
         }
       }
 
       return;
     }
 
     $config_max_pages = $this->getConfig('notification.max_pages', 5);
     $config_page_size = $this->getConfig('notification.page_size', 10);
 
     $last_seen_chrono_key = $this->lastSeenChronoKey;
     $chrono_key_cursor = 0;
 
     // Not efficient but works due to feed.query API
     for ($max_pages = $config_max_pages; $max_pages > 0; $max_pages--) {
       $stories = $this->getConduit()->callMethodSynchronous(
         'feed.query',
         array(
           'limit' => $config_page_size,
           'after' => $chrono_key_cursor,
           'view' => 'text',
         ));
 
       foreach ($stories as $story) {
         if ($story['chronologicalKey'] == $last_seen_chrono_key) {
           // Caught up on feed
           return;
         }
         if ($story['chronologicalKey'] > $this->lastSeenChronoKey) {
           // Keep track of newest seen story
           $this->lastSeenChronoKey = $story['chronologicalKey'];
         }
         if (!$chrono_key_cursor ||
             $story['chronologicalKey'] < $chrono_key_cursor) {
           // Keep track of oldest story on this page
           $chrono_key_cursor = $story['chronologicalKey'];
         }
 
         if (!$story['text'] ||
             !$this->shouldShowStory($story)) {
           continue;
         }
 
         $message = $story['text'];
 
         $story_object_type = phid_get_type($story['objectPHID']);
         if (in_array($story_object_type, $this->typesNeedURI)) {
           $objects = $this->getConduit()->callMethodSynchronous(
             'phid.lookup',
             array(
               'names' => array($story['objectPHID']),
             ));
           $message .= ' '.$objects[$story['objectPHID']]['uri'];
         }
 
         $channels = $this->getConfig('join');
         foreach ($channels as $channel_name) {
 
           $channel = id(new PhabricatorBotChannel())
             ->setName($channel_name);
 
           $this->writeMessage(
             id(new PhabricatorBotMessage())
             ->setCommand('MESSAGE')
             ->setTarget($channel)
             ->setBody($message));
         }
       }
     }
   }
 
 }
diff --git a/src/infrastructure/daemon/bot/handler/PhabricatorBotHandler.php b/src/infrastructure/daemon/bot/handler/PhabricatorBotHandler.php
index 9dd449b155..b649d33619 100644
--- a/src/infrastructure/daemon/bot/handler/PhabricatorBotHandler.php
+++ b/src/infrastructure/daemon/bot/handler/PhabricatorBotHandler.php
@@ -1,73 +1,72 @@
 <?php
 
 /**
  * Responds to IRC messages. You plug a bunch of these into a
  * @{class:PhabricatorBot} to give it special behavior.
- *
- * @group irc
  */
 abstract class PhabricatorBotHandler {
 
   private $bot;
 
   final public function __construct(PhabricatorBot $irc_bot) {
     $this->bot = $irc_bot;
   }
 
   final protected function writeMessage(PhabricatorBotMessage $message) {
     $this->bot->writeMessage($message);
     return $this;
   }
 
   final protected function getConduit() {
     return $this->bot->getConduit();
   }
 
   final protected function getConfig($key, $default = null) {
     return $this->bot->getConfig($key, $default);
   }
 
   final protected function getURI($path) {
     $base_uri = new PhutilURI($this->bot->getConfig('conduit.uri'));
     $base_uri->setPath($path);
     return (string)$base_uri;
   }
 
   final protected function getServiceName() {
     return $this->bot->getAdapter()->getServiceName();
   }
 
   final protected function getServiceType() {
     return $this->bot->getAdapter()->getServiceType();
   }
 
   abstract public function receiveMessage(PhabricatorBotMessage $message);
 
   public function runBackgroundTasks() {
     return;
   }
 
   public function replyTo(PhabricatorBotMessage $original_message, $body) {
     if ($original_message->getCommand() != 'MESSAGE') {
       throw new Exception(
         'Handler is trying to reply to something which is not a message!');
     }
 
     $reply = id(new PhabricatorBotMessage())
       ->setCommand('MESSAGE');
 
     if ($original_message->getTarget()->isPublic()) {
       // This is a public target, like a chatroom. Send the response to the
       // chatroom.
       $reply->setTarget($original_message->getTarget());
     } else {
       // This is a private target, like a private message. Send the response
       // back to the sender (presumably, we are the target).
       $reply->setTarget($original_message->getSender());
     }
 
     $reply->setBody($body);
 
     return $this->writeMessage($reply);
   }
+
 }
diff --git a/src/infrastructure/daemon/bot/handler/PhabricatorBotLogHandler.php b/src/infrastructure/daemon/bot/handler/PhabricatorBotLogHandler.php
index 7f110c9487..4f0a9dee35 100644
--- a/src/infrastructure/daemon/bot/handler/PhabricatorBotLogHandler.php
+++ b/src/infrastructure/daemon/bot/handler/PhabricatorBotLogHandler.php
@@ -1,80 +1,77 @@
 <?php
 
 /**
  * Logs chatter.
- *
- * @group irc
  */
 final class PhabricatorBotLogHandler extends PhabricatorBotHandler {
 
   private $futures = array();
 
   public function receiveMessage(PhabricatorBotMessage $message) {
-
     switch ($message->getCommand()) {
       case 'MESSAGE':
         $target = $message->getTarget();
         if (!$target->isPublic()) {
           // Don't log private messages, although maybe we should for debugging?
           break;
         }
 
         $target_name = $target->getName();
 
         $logs = array(
           array(
             'channel' => $target_name,
             'type'    => 'mesg',
             'epoch'   => time(),
             'author'  => $message->getSender()->getName(),
             'message' => $message->getBody(),
             'serviceName' => $this->getServiceName(),
             'serviceType' => $this->getServiceType(),
           ),
         );
 
         $this->futures[] = $this->getConduit()->callMethod(
           'chatlog.record',
           array(
             'logs' => $logs,
           ));
 
         $prompts = array(
           '/where is the (chat)?log\?/i',
           '/where am i\?/i',
           '/what year is (this|it)\?/i',
         );
 
         $tell = false;
         foreach ($prompts as $prompt) {
           if (preg_match($prompt, $message->getBody())) {
             $tell = true;
             break;
           }
         }
 
         if ($tell) {
           $response = $this->getURI(
             '/chatlog/channel/'.phutil_escape_uri($target_name).'/');
 
           $this->replyTo($message, $response);
         }
 
         break;
     }
   }
 
   public function runBackgroundTasks() {
     foreach ($this->futures as $key => $future) {
       try {
         if ($future->isReady()) {
           unset($this->futures[$key]);
         }
       } catch (Exception $ex) {
         unset($this->futures[$key]);
         phlog($ex);
       }
     }
   }
 
 }
diff --git a/src/infrastructure/daemon/bot/handler/PhabricatorBotMacroHandler.php b/src/infrastructure/daemon/bot/handler/PhabricatorBotMacroHandler.php
index 009982fb5b..10bbbd48b9 100644
--- a/src/infrastructure/daemon/bot/handler/PhabricatorBotMacroHandler.php
+++ b/src/infrastructure/daemon/bot/handler/PhabricatorBotMacroHandler.php
@@ -1,164 +1,161 @@
 <?php
 
-/**
- * @group irc
- */
 final class PhabricatorBotMacroHandler extends PhabricatorBotHandler {
 
   private $macros;
   private $regexp;
 
   private $next = 0;
 
   private function init() {
     if ($this->macros === false) {
       return false;
     }
 
     if ($this->macros !== null) {
       return true;
     }
 
     $macros = $this->getConduit()->callMethodSynchronous(
       'macro.query',
       array());
 
     // If we have no macros, cache `false` (meaning "no macros") and return
     // immediately.
     if (!$macros) {
       $this->macros = false;
       return false;
     }
 
     $regexp = array();
     foreach ($macros as $macro_name => $macro) {
       $regexp[] = preg_quote($macro_name, '/');
     }
     $regexp = '/('.implode('|', $regexp).')/';
 
     $this->macros = $macros;
     $this->regexp = $regexp;
 
     return true;
   }
 
   public function receiveMessage(PhabricatorBotMessage $message) {
     if (!$this->init()) {
       return;
     }
 
     switch ($message->getCommand()) {
       case 'MESSAGE':
         $message_body = $message->getBody();
 
         $matches = null;
         if (!preg_match($this->regexp, $message_body, $matches)) {
           return;
         }
 
         $macro = $matches[1];
 
         $ascii = idx($this->macros[$macro], 'ascii');
         if ($ascii === false) {
           return;
         }
 
         if (!$ascii) {
           $this->macros[$macro]['ascii'] = $this->rasterize(
             $this->macros[$macro],
             $this->getConfig('macro.size', 48),
             $this->getConfig('macro.aspect', 0.66));
           $ascii = $this->macros[$macro]['ascii'];
         }
 
         $target_name = $message->getTarget()->getName();
         foreach ($ascii as $line) {
           $this->replyTo($message, $line);
         }
         break;
     }
   }
 
   public function rasterize($macro, $size, $aspect) {
     $image = HTTPSFuture::loadContent($macro['uri']);
     if (!$image) {
       return false;
     }
 
     $img = @imagecreatefromstring($image);
     if (!$img) {
       return false;
     }
 
     $sx = imagesx($img);
     $sy = imagesy($img);
 
     if ($sx > $size || $sy > $size) {
       $scale = max($sx, $sy) / $size;
       $dx = floor($sx / $scale);
       $dy = floor($sy / $scale);
     } else {
       $dx = $sx;
       $dy = $sy;
     }
 
     $dy = floor($dy * $aspect);
 
     $dst = imagecreatetruecolor($dx, $dy);
     if (!$dst) {
       return false;
     }
     imagealphablending($dst, false);
 
     $ok = imagecopyresampled(
       $dst, $img,
       0, 0,
       0, 0,
       $dx, $dy,
       $sx, $sy);
 
     if (!$ok) {
       return false;
     }
 
     $map = array(
       ' ',
       '.',
       ',',
       ':',
       ';',
       '!',
       '|',
       '*',
       '=',
       '@',
       '$',
       '#',
     );
 
     $lines = array();
 
     for ($ii = 0; $ii < $dy; $ii++) {
       $buf = '';
       for ($jj = 0; $jj < $dx; $jj++) {
         $c = imagecolorat($dst, $jj, $ii);
 
         $a = ($c >> 24) & 0xFF;
         $r = ($c >> 16) & 0xFF;
         $g = ($c >> 8) & 0xFF;
         $b = ($c) & 0xFF;
 
         $luma = (255 - ((0.30 * $r) + (0.59 * $g) + (0.11 * $b))) / 256;
         $luma *= ((127 - $a) / 127);
 
         $char = $map[max(0, floor($luma * count($map)))];
         $buf .= $char;
       }
 
       $lines[] = $buf;
     }
 
     return $lines;
   }
 
 }
diff --git a/src/infrastructure/daemon/bot/handler/PhabricatorBotObjectNameHandler.php b/src/infrastructure/daemon/bot/handler/PhabricatorBotObjectNameHandler.php
index 800f5aa767..9bdc0d0253 100644
--- a/src/infrastructure/daemon/bot/handler/PhabricatorBotObjectNameHandler.php
+++ b/src/infrastructure/daemon/bot/handler/PhabricatorBotObjectNameHandler.php
@@ -1,197 +1,194 @@
 <?php
 
 /**
  * Looks for Dxxxx, Txxxx and links to them.
- *
- * @group irc
  */
 final class PhabricatorBotObjectNameHandler extends PhabricatorBotHandler {
 
   /**
    * Map of PHIDs to the last mention of them (as an epoch timestamp); prevents
    * us from spamming chat when a single object is discussed.
    */
   private $recentlyMentioned = array();
 
   public function receiveMessage(PhabricatorBotMessage $original_message) {
-
     switch ($original_message->getCommand()) {
-    case 'MESSAGE':
-      $message = $original_message->getBody();
-      $matches = null;
-
-      $paste_ids = array();
-      $commit_names = array();
-      $vote_ids = array();
-      $file_ids = array();
-      $object_names = array();
-      $output = array();
-
-      $pattern =
-        '@'.
-        '(?<!/)(?:^|\b)'.
-        '(R2D2)'.
-        '(?:\b|$)'.
-        '@';
-
-      if (preg_match_all($pattern, $message, $matches, PREG_SET_ORDER)) {
-        foreach ($matches as $match) {
-          switch ($match[1]) {
-            case 'R2D2':
-              $output[$match[1]] = pht('beep hoop bop');
-              break;
+      case 'MESSAGE':
+        $message = $original_message->getBody();
+        $matches = null;
+
+        $paste_ids = array();
+        $commit_names = array();
+        $vote_ids = array();
+        $file_ids = array();
+        $object_names = array();
+        $output = array();
+
+        $pattern =
+          '@'.
+          '(?<!/)(?:^|\b)'.
+          '(R2D2)'.
+          '(?:\b|$)'.
+          '@';
+
+        if (preg_match_all($pattern, $message, $matches, PREG_SET_ORDER)) {
+          foreach ($matches as $match) {
+            switch ($match[1]) {
+              case 'R2D2':
+                $output[$match[1]] = pht('beep hoop bop');
+                break;
+            }
           }
         }
-      }
-
-      $pattern =
-        '@'.
-        '(?<!/)(?:^|\b)'. // Negative lookbehind prevent matching "/D123".
-        '([A-Z])(\d+)'.
-        '(?:\b|$)'.
-        '@';
-
-      if (preg_match_all($pattern, $message, $matches, PREG_SET_ORDER)) {
-        foreach ($matches as $match) {
-          switch ($match[1]) {
-            case 'P':
-              $paste_ids[] = $match[2];
-              break;
-            case 'V':
-              $vote_ids[] = $match[2];
-              break;
-            case 'F':
-              $file_ids[] = $match[2];
-              break;
-            default:
-              $name = $match[1].$match[2];
-              switch ($name) {
-                case 'T1000':
-                  $output[$name] = pht(
-                    'T1000: A mimetic poly-alloy assassin controlled by '.
-                    'Skynet');
-                  break;
-                default:
-                  $object_names[] = $name;
-                  break;
-              }
-              break;
+
+        $pattern =
+          '@'.
+          '(?<!/)(?:^|\b)'. // Negative lookbehind prevent matching "/D123".
+          '([A-Z])(\d+)'.
+          '(?:\b|$)'.
+          '@';
+
+        if (preg_match_all($pattern, $message, $matches, PREG_SET_ORDER)) {
+          foreach ($matches as $match) {
+            switch ($match[1]) {
+              case 'P':
+                $paste_ids[] = $match[2];
+                break;
+              case 'V':
+                $vote_ids[] = $match[2];
+                break;
+              case 'F':
+                $file_ids[] = $match[2];
+                break;
+              default:
+                $name = $match[1].$match[2];
+                switch ($name) {
+                  case 'T1000':
+                    $output[$name] = pht(
+                      'T1000: A mimetic poly-alloy assassin controlled by '.
+                      'Skynet');
+                    break;
+                  default:
+                    $object_names[] = $name;
+                    break;
+                }
+                break;
+            }
           }
         }
-      }
-
-      $pattern =
-        '@'.
-        '(?<!/)(?:^|\b)'.
-        '(r[A-Z]+)([0-9a-z]{0,40})'.
-        '(?:\b|$)'.
-        '@';
-      if (preg_match_all($pattern, $message, $matches, PREG_SET_ORDER)) {
-        foreach ($matches as $match) {
-          if ($match[2]) {
-            $commit_names[] = $match[1].$match[2];
-          } else {
-            $object_names[] = $match[1];
+
+        $pattern =
+          '@'.
+          '(?<!/)(?:^|\b)'.
+          '(r[A-Z]+)([0-9a-z]{0,40})'.
+          '(?:\b|$)'.
+          '@';
+        if (preg_match_all($pattern, $message, $matches, PREG_SET_ORDER)) {
+          foreach ($matches as $match) {
+            if ($match[2]) {
+              $commit_names[] = $match[1].$match[2];
+            } else {
+              $object_names[] = $match[1];
+            }
           }
         }
-      }
-
-      if ($object_names) {
-        $objects = $this->getConduit()->callMethodSynchronous(
-          'phid.lookup',
-          array(
-            'names' => $object_names,
-          ));
-        foreach ($objects as $object) {
-          $output[$object['phid']] = $object['fullName'].' - '.$object['uri'];
-        }
-      }
 
-      if ($vote_ids) {
-        foreach ($vote_ids as $vote_id) {
-          $vote = $this->getConduit()->callMethodSynchronous(
-            'slowvote.info',
+        if ($object_names) {
+          $objects = $this->getConduit()->callMethodSynchronous(
+            'phid.lookup',
             array(
-              'poll_id' => $vote_id,
+              'names' => $object_names,
             ));
-          $output[$vote['phid']] = 'V'.$vote['id'].': '.$vote['question'].
-            ' Come Vote '.$vote['uri'];
+          foreach ($objects as $object) {
+            $output[$object['phid']] = $object['fullName'].' - '.$object['uri'];
+          }
         }
-      }
 
-      if ($file_ids) {
-        foreach ($file_ids as $file_id) {
-          $file = $this->getConduit()->callMethodSynchronous(
-            'file.info',
-            array(
-              'id' => $file_id,
-            ));
-          $output[$file['phid']] = $file['objectName'].': '.$file['uri'].' - '.
-            $file['name'];
+        if ($vote_ids) {
+          foreach ($vote_ids as $vote_id) {
+            $vote = $this->getConduit()->callMethodSynchronous(
+              'slowvote.info',
+              array(
+                'poll_id' => $vote_id,
+              ));
+            $output[$vote['phid']] = 'V'.$vote['id'].': '.$vote['question'].
+              ' Come Vote '.$vote['uri'];
+          }
         }
-      }
 
-      if ($paste_ids) {
-        foreach ($paste_ids as $paste_id) {
-          $paste = $this->getConduit()->callMethodSynchronous(
-            'paste.info',
-            array(
-              'paste_id' => $paste_id,
-            ));
-          // Eventually I'd like to show the username of the paster as well,
-          // however that will need something like a user.username_from_phid
-          // since we (ideally) want to keep the bot to Conduit calls...and
-          // not call to Phabricator-specific stuff (like actually loading
-          // the User object and fetching his/her username.)
-          $output[$paste['phid']] = 'P'.$paste['id'].': '.$paste['uri'].' - '.
-            $paste['title'];
-
-          if ($paste['language']) {
-            $output[$paste['phid']] .= ' ('.$paste['language'].')';
+        if ($file_ids) {
+          foreach ($file_ids as $file_id) {
+            $file = $this->getConduit()->callMethodSynchronous(
+              'file.info',
+              array(
+                'id' => $file_id,
+              ));
+            $output[$file['phid']] = $file['objectName'].': '.$file['uri'].' - '.
+              $file['name'];
           }
         }
-      }
-
-      if ($commit_names) {
-        $commits = $this->getConduit()->callMethodSynchronous(
-          'diffusion.getcommits',
-          array(
-            'commits' => $commit_names,
-          ));
-        foreach ($commits as $commit) {
-          if (isset($commit['error'])) {
-            continue;
+
+        if ($paste_ids) {
+          foreach ($paste_ids as $paste_id) {
+            $paste = $this->getConduit()->callMethodSynchronous(
+              'paste.info',
+              array(
+                'paste_id' => $paste_id,
+              ));
+            // Eventually I'd like to show the username of the paster as well,
+            // however that will need something like a user.username_from_phid
+            // since we (ideally) want to keep the bot to Conduit calls...and
+            // not call to Phabricator-specific stuff (like actually loading
+            // the User object and fetching his/her username.)
+            $output[$paste['phid']] = 'P'.$paste['id'].': '.$paste['uri'].' - '.
+              $paste['title'];
+
+            if ($paste['language']) {
+              $output[$paste['phid']] .= ' ('.$paste['language'].')';
+            }
           }
-          $output[$commit['commitPHID']] = $commit['uri'];
         }
-      }
 
-      foreach ($output as $phid => $description) {
+        if ($commit_names) {
+          $commits = $this->getConduit()->callMethodSynchronous(
+            'diffusion.getcommits',
+            array(
+              'commits' => $commit_names,
+            ));
+          foreach ($commits as $commit) {
+            if (isset($commit['error'])) {
+              continue;
+            }
+            $output[$commit['commitPHID']] = $commit['uri'];
+          }
+        }
 
-        // Don't mention the same object more than once every 10 minutes
-        // in public channels, so we avoid spamming the chat over and over
-        // again for discsussions of a specific revision, for example.
+        foreach ($output as $phid => $description) {
 
-        $target_name = $original_message->getTarget()->getName();
-        if (empty($this->recentlyMentioned[$target_name])) {
-          $this->recentlyMentioned[$target_name] = array();
-        }
+          // Don't mention the same object more than once every 10 minutes
+          // in public channels, so we avoid spamming the chat over and over
+          // again for discsussions of a specific revision, for example.
 
-        $quiet_until = idx(
-          $this->recentlyMentioned[$target_name],
-          $phid,
-          0) + (60 * 10);
+          $target_name = $original_message->getTarget()->getName();
+          if (empty($this->recentlyMentioned[$target_name])) {
+            $this->recentlyMentioned[$target_name] = array();
+          }
 
-        if (time() < $quiet_until) {
-          // Remain quiet on this channel.
-          continue;
-        }
+          $quiet_until = idx(
+            $this->recentlyMentioned[$target_name],
+            $phid,
+            0) + (60 * 10);
 
-        $this->recentlyMentioned[$target_name][$phid] = time();
-        $this->replyTo($original_message, $description);
-      }
-      break;
+          if (time() < $quiet_until) {
+            // Remain quiet on this channel.
+            continue;
+          }
+
+          $this->recentlyMentioned[$target_name][$phid] = time();
+          $this->replyTo($original_message, $description);
+        }
+        break;
     }
   }
 
 }
diff --git a/src/infrastructure/daemon/bot/handler/PhabricatorBotSymbolHandler.php b/src/infrastructure/daemon/bot/handler/PhabricatorBotSymbolHandler.php
index 536f8713ad..48734af94a 100644
--- a/src/infrastructure/daemon/bot/handler/PhabricatorBotSymbolHandler.php
+++ b/src/infrastructure/daemon/bot/handler/PhabricatorBotSymbolHandler.php
@@ -1,50 +1,47 @@
 <?php
 
 /**
  * Watches for "where is <symbol>?"
- *
- * @group irc
  */
 final class PhabricatorBotSymbolHandler extends PhabricatorBotHandler {
 
   public function receiveMessage(PhabricatorBotMessage $message) {
-
     switch ($message->getCommand()) {
-    case 'MESSAGE':
-      $text = $message->getBody();
-
-      $matches = null;
-      if (!preg_match('/where(?: in the world)? is (\S+?)\?/i',
-        $text, $matches)) {
-          break;
+      case 'MESSAGE':
+        $text = $message->getBody();
+
+        $matches = null;
+        if (!preg_match('/where(?: in the world)? is (\S+?)\?/i',
+          $text, $matches)) {
+            break;
+          }
+
+        $symbol = $matches[1];
+        $results = $this->getConduit()->callMethodSynchronous(
+          'diffusion.findsymbols',
+          array(
+            'name' => $symbol,
+          ));
+
+        $default_uri = $this->getURI('/diffusion/symbol/'.$symbol.'/');
+
+        if (count($results) > 1) {
+          $response = "Multiple symbols named '{$symbol}': {$default_uri}";
+        } else if (count($results) == 1) {
+          $result = head($results);
+          $response =
+            $result['type'].' '.
+            $result['name'].' '.
+            '('.$result['language'].'): '.
+            nonempty($result['uri'], $default_uri);
+        } else {
+          $response = "No symbol '{$symbol}' found anywhere.";
         }
 
-      $symbol = $matches[1];
-      $results = $this->getConduit()->callMethodSynchronous(
-        'diffusion.findsymbols',
-        array(
-          'name' => $symbol,
-        ));
-
-      $default_uri = $this->getURI('/diffusion/symbol/'.$symbol.'/');
-
-      if (count($results) > 1) {
-        $response = "Multiple symbols named '{$symbol}': {$default_uri}";
-      } else if (count($results) == 1) {
-        $result = head($results);
-        $response =
-          $result['type'].' '.
-          $result['name'].' '.
-          '('.$result['language'].'): '.
-          nonempty($result['uri'], $default_uri);
-      } else {
-        $response = "No symbol '{$symbol}' found anywhere.";
-      }
-
-      $this->replyTo($message, $response);
-
-      break;
+        $this->replyTo($message, $response);
+
+        break;
     }
   }
 
 }
diff --git a/src/infrastructure/daemon/bot/handler/PhabricatorBotWhatsNewHandler.php b/src/infrastructure/daemon/bot/handler/PhabricatorBotWhatsNewHandler.php
index e052230410..59a921555c 100644
--- a/src/infrastructure/daemon/bot/handler/PhabricatorBotWhatsNewHandler.php
+++ b/src/infrastructure/daemon/bot/handler/PhabricatorBotWhatsNewHandler.php
@@ -1,45 +1,43 @@
 <?php
 
 /**
  * Responds to "Whats new?" with some recent feed content
- *
- * @group irc
  */
 final class PhabricatorBotWhatsNewHandler extends PhabricatorBotHandler {
 
   private $floodblock = 0;
 
   public function receiveMessage(PhabricatorBotMessage $message) {
     switch ($message->getCommand()) {
       case 'MESSAGE':
         $message_body = $message->getBody();
         $now = time();
 
         $prompt = '~what( i|\')?s new\?~i';
         if (preg_match($prompt, $message_body)) {
           if ($now < $this->floodblock) {
             return;
           }
           $this->floodblock = $now + 60;
           $this->reportNew($message);
         }
         break;
     }
   }
 
   public function reportNew(PhabricatorBotMessage $message) {
     $latest = $this->getConduit()->callMethodSynchronous(
       'feed.query',
       array(
         'limit' => 5,
         'view'  => 'text'
       ));
 
     foreach ($latest as $feed_item) {
       if (isset($feed_item['text'])) {
         $this->replyTo($message, html_entity_decode($feed_item['text']));
       }
     }
   }
 
 }
diff --git a/src/infrastructure/daemon/workers/PhabricatorWorker.php b/src/infrastructure/daemon/workers/PhabricatorWorker.php
index b162f4344a..074d580a52 100644
--- a/src/infrastructure/daemon/workers/PhabricatorWorker.php
+++ b/src/infrastructure/daemon/workers/PhabricatorWorker.php
@@ -1,241 +1,239 @@
 <?php
 
 /**
  * @task config   Configuring Retries and Failures
- *
- * @group worker
  */
 abstract class PhabricatorWorker {
 
   private $data;
   private static $runAllTasksInProcess = false;
   private $queuedTasks = array();
 
 
 /* -(  Configuring Retries and Failures  )----------------------------------- */
 
 
   /**
    * Return the number of seconds this worker needs hold a lease on the task for
    * while it performs work. For most tasks you can leave this at `null`, which
    * will give you a default lease (currently 2 hours).
    *
    * For tasks which may take a very long time to complete, you should return
    * an upper bound on the amount of time the task may require.
    *
    * @return int|null  Number of seconds this task needs to remain leased for,
    *                   or null for a default lease.
    *
    * @task config
    */
   public function getRequiredLeaseTime() {
     return null;
   }
 
 
   /**
    * Return the maximum number of times this task may be retried before it
    * is considered permanently failed. By default, tasks retry indefinitely. You
    * can throw a @{class:PhabricatorWorkerPermanentFailureException} to cause an
    * immediate permanent failure.
    *
    * @return int|null   Number of times the task will retry before permanent
    *                    failure. Return `null` to retry indefinitely.
    *
    * @task config
    */
   public function getMaximumRetryCount() {
     return null;
   }
 
 
   /**
    * Return the number of seconds a task should wait after a failure before
    * retrying. For most tasks you can leave this at `null`, which will give you
    * a short default retry period (currently 60 seconds).
    *
    * @param   PhabricatorWorkerTask   The task itself. This object is probably
    *                                  useful mostly to examine the failure
    *                                  count if you want to implement staggered
    *                                  retries, or to examine the execution
    *                                  exception if you want to react to
    *                                  different failures in different ways.
    * @return  int|null                Number of seconds to wait between retries,
    *                                  or null for a default retry period
    *                                  (currently 60 seconds).
    *
    * @task config
    */
   public function getWaitBeforeRetry(PhabricatorWorkerTask $task) {
     return null;
   }
 
   abstract protected function doWork();
 
 
   final public function __construct($data) {
     $this->data = $data;
   }
 
   final protected function getTaskData() {
     return $this->data;
   }
 
   final public function executeTask() {
     $this->doWork();
   }
 
   final public static function scheduleTask($task_class, $data) {
     $task = id(new PhabricatorWorkerActiveTask())
       ->setTaskClass($task_class)
       ->setData($data);
 
     if (self::$runAllTasksInProcess) {
       // Do the work in-process.
       $worker = newv($task_class, array($data));
 
       while (true) {
         try {
           $worker->doWork();
           foreach ($worker->getQueuedTasks() as $queued_task) {
             list($queued_class, $queued_data) = $queued_task;
             self::scheduleTask($queued_class, $queued_data);
           }
           break;
         } catch (PhabricatorWorkerYieldException $ex) {
           phlog(
             pht(
               'In-process task "%s" yielded for %s seconds, sleeping...',
               $task_class,
               $ex->getDuration()));
 
           sleep($ex->getDuration());
         }
       }
 
       // Now, save a task row and immediately archive it so we can return an
       // object with a valid ID.
       $task->openTransaction();
         $task->save();
         $archived = $task->archiveTask(
           PhabricatorWorkerArchiveTask::RESULT_SUCCESS,
           0);
       $task->saveTransaction();
 
       return $archived;
     } else {
       $task->save();
       return $task;
     }
   }
 
 
   /**
    * Wait for tasks to complete. If tasks are not leased by other workers, they
    * will be executed in this process while waiting.
    *
    * @param list<int>   List of queued task IDs to wait for.
    * @return void
    */
   final public static function waitForTasks(array $task_ids) {
     if (!$task_ids) {
       return;
     }
 
     $task_table = new PhabricatorWorkerActiveTask();
 
     $waiting = array_fuse($task_ids);
     while ($waiting) {
       $conn_w = $task_table->establishConnection('w');
 
       // Check if any of the tasks we're waiting on are still queued. If they
       // are not, we're done waiting.
       $row = queryfx_one(
         $conn_w,
         'SELECT COUNT(*) N FROM %T WHERE id IN (%Ld)',
         $task_table->getTableName(),
         $waiting);
       if (!$row['N']) {
         // Nothing is queued anymore. Stop waiting.
         break;
       }
 
       $tasks = id(new PhabricatorWorkerLeaseQuery())
         ->withIDs($waiting)
         ->setLimit(1)
         ->execute();
 
       if (!$tasks) {
         // We were not successful in leasing anything. Sleep for a bit and
         // see if we have better luck later.
         sleep(1);
         continue;
       }
 
       $task = head($tasks)->executeTask();
 
       $ex = $task->getExecutionException();
       if ($ex) {
         throw $ex;
       }
     }
 
     $tasks = id(new PhabricatorWorkerArchiveTask())->loadAllWhere(
       'id IN (%Ld)',
       $task_ids);
 
     foreach ($tasks as $task) {
       if ($task->getResult() != PhabricatorWorkerArchiveTask::RESULT_SUCCESS) {
         throw new Exception(
           pht('Task %d failed!', $task->getID()));
       }
     }
   }
 
   public function renderForDisplay(PhabricatorUser $viewer) {
     $data = PhutilReadableSerializer::printableValue($this->data);
     return phutil_tag('pre', array(), $data);
   }
 
   /**
    * Set this flag to execute scheduled tasks synchronously, in the same
    * process. This is useful for debugging, and otherwise dramatically worse
    * in every way imaginable.
    */
   public static function setRunAllTasksInProcess($all) {
     self::$runAllTasksInProcess = $all;
   }
 
   protected function log($pattern /* $args */) {
     $console = PhutilConsole::getConsole();
     $argv = func_get_args();
     call_user_func_array(array($console, 'writeLog'), $argv);
     return $this;
   }
 
 
   /**
-   * Queue a task to be executed after this one suceeds.
+   * Queue a task to be executed after this one succeeds.
    *
    * The followup task will be queued only if this task completes cleanly.
    *
    * @param string Task class to queue.
    * @param array  Data for the followup task.
    * @return this
    */
   protected function queueTask($class, array $data) {
     $this->queuedTasks[] = array($class, $data);
     return $this;
   }
 
 
   /**
    * Get tasks queued as followups by @{method:queueTask}.
    *
    * @return list<pair<string, wild>> Queued task specifications.
    */
   public function getQueuedTasks() {
     return $this->queuedTasks;
   }
 
 }
diff --git a/src/infrastructure/daemon/workers/query/PhabricatorWorkerLeaseQuery.php b/src/infrastructure/daemon/workers/query/PhabricatorWorkerLeaseQuery.php
index 3447206173..ca0d5db5c6 100644
--- a/src/infrastructure/daemon/workers/query/PhabricatorWorkerLeaseQuery.php
+++ b/src/infrastructure/daemon/workers/query/PhabricatorWorkerLeaseQuery.php
@@ -1,236 +1,234 @@
 <?php
 
 /**
  * Select and lease tasks from the worker task queue.
- *
- * @group worker
  */
 final class PhabricatorWorkerLeaseQuery extends PhabricatorQuery {
 
   const PHASE_UNLEASED = 'unleased';
   const PHASE_EXPIRED  = 'expired';
 
   private $ids;
   private $limit;
 
   public static function getDefaultWaitBeforeRetry() {
     return phutil_units('5 minutes in seconds');
   }
 
   public static function getDefaultLeaseDuration() {
     return phutil_units('2 hours in seconds');
   }
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
     return $this;
   }
 
   public function setLimit($limit) {
     $this->limit = $limit;
     return $this;
   }
 
   public function execute() {
     if (!$this->limit) {
       throw new Exception('You must setLimit() when leasing tasks.');
     }
 
     $task_table = new PhabricatorWorkerActiveTask();
     $taskdata_table = new PhabricatorWorkerTaskData();
     $lease_ownership_name = $this->getLeaseOwnershipName();
 
     $conn_w = $task_table->establishConnection('w');
 
     // Try to satisfy the request from new, unleased tasks first. If we don't
     // find enough tasks, try tasks with expired leases (i.e., tasks which have
     // previously failed).
 
     $phases = array(
       self::PHASE_UNLEASED,
       self::PHASE_EXPIRED,
     );
     $limit = $this->limit;
 
     $leased = 0;
     foreach ($phases as $phase) {
 
       // NOTE: If we issue `UPDATE ... WHERE ... ORDER BY id ASC`, the query
       // goes very, very slowly. The `ORDER BY` triggers this, although we get
       // the same apparent results without it. Without the ORDER BY, binary
       // read slaves complain that the query isn't repeatable. To avoid both
       // problems, do a SELECT and then an UPDATE.
 
       $rows = queryfx_all(
         $conn_w,
         'SELECT id, leaseOwner FROM %T %Q %Q %Q',
         $task_table->getTableName(),
         $this->buildWhereClause($conn_w, $phase),
         $this->buildOrderClause($conn_w, $phase),
         $this->buildLimitClause($conn_w, $limit - $leased));
 
       // NOTE: Sometimes, we'll race with another worker and they'll grab
       // this task before we do. We could reduce how often this happens by
       // selecting more tasks than we need, then shuffling them and trying
       // to lock only the number we're actually after. However, the amount
       // of time workers spend here should be very small relative to their
       // total runtime, so keep it simple for the moment.
 
       if ($rows) {
         queryfx(
           $conn_w,
           'UPDATE %T task
             SET leaseOwner = %s, leaseExpires = UNIX_TIMESTAMP() + %d
             %Q',
           $task_table->getTableName(),
           $lease_ownership_name,
           self::getDefaultLeaseDuration(),
           $this->buildUpdateWhereClause($conn_w, $phase, $rows));
 
         $leased += $conn_w->getAffectedRows();
         if ($leased == $limit) {
           break;
         }
       }
     }
 
     if (!$leased) {
       return array();
     }
 
     $data = queryfx_all(
       $conn_w,
       'SELECT task.*, taskdata.data _taskData, UNIX_TIMESTAMP() _serverTime
         FROM %T task LEFT JOIN %T taskdata
           ON taskdata.id = task.dataID
         WHERE leaseOwner = %s AND leaseExpires > UNIX_TIMESTAMP()
         %Q %Q',
       $task_table->getTableName(),
       $taskdata_table->getTableName(),
       $lease_ownership_name,
       $this->buildOrderClause($conn_w, $phase),
       $this->buildLimitClause($conn_w, $limit));
 
     $tasks = $task_table->loadAllFromArray($data);
     $tasks = mpull($tasks, null, 'getID');
 
     foreach ($data as $row) {
       $tasks[$row['id']]->setServerTime($row['_serverTime']);
       if ($row['_taskData']) {
         $task_data = json_decode($row['_taskData'], true);
       } else {
         $task_data = null;
       }
       $tasks[$row['id']]->setData($task_data);
     }
 
     return $tasks;
   }
 
   private function buildWhereClause(AphrontDatabaseConnection $conn_w, $phase) {
 
     $where = array();
 
     switch ($phase) {
       case self::PHASE_UNLEASED:
         $where[] = 'leaseOwner IS NULL';
         break;
       case self::PHASE_EXPIRED:
         $where[] = 'leaseExpires < UNIX_TIMESTAMP()';
         break;
       default:
         throw new Exception("Unknown phase '{$phase}'!");
     }
 
     if ($this->ids) {
       $where[] = qsprintf(
         $conn_w,
         'id IN (%Ld)',
         $this->ids);
     }
 
     return $this->formatWhereClause($where);
   }
 
   private function buildUpdateWhereClause(
     AphrontDatabaseConnection $conn_w,
     $phase,
     array $rows) {
 
     $where = array();
 
     // NOTE: This is basically working around the MySQL behavior that
     // `IN (NULL)` doesn't match NULL.
 
     switch ($phase) {
       case self::PHASE_UNLEASED:
         $where[] = qsprintf(
           $conn_w,
           'leaseOwner IS NULL');
         $where[] = qsprintf(
           $conn_w,
           'id IN (%Ld)',
           ipull($rows, 'id'));
         break;
       case self::PHASE_EXPIRED:
         $in = array();
         foreach ($rows as $row) {
           $in[] = qsprintf(
             $conn_w,
             '(id = %d AND leaseOwner = %s)',
             $row['id'],
             $row['leaseOwner']);
         }
         $where[] = qsprintf(
           $conn_w,
           '(%Q)',
           implode(' OR ', $in));
         break;
       default:
         throw new Exception("Unknown phase '{$phase}'!");
     }
 
     return $this->formatWhereClause($where);
 
   }
 
   private function buildOrderClause(AphrontDatabaseConnection $conn_w, $phase) {
     switch ($phase) {
       case self::PHASE_UNLEASED:
         // When selecting new tasks, we want to consume them in roughly
         // FIFO order, so we order by the task ID.
         return qsprintf($conn_w, 'ORDER BY id ASC');
       case self::PHASE_EXPIRED:
         // When selecting failed tasks, we want to consume them in roughly
         // FIFO order of their failures, which is not necessarily their original
         // queue order.
 
         // Particularly, this is important for tasks which use soft failures to
         // indicate that they are waiting on other tasks to complete: we need to
         // push them to the end of the queue after they fail, at least on
         // average, so we don't deadlock retrying the same blocked task over
         // and over again.
         return qsprintf($conn_w, 'ORDER BY leaseExpires ASC');
       default:
         throw new Exception(pht('Unknown phase "%s"!', $phase));
     }
   }
 
   private function buildLimitClause(AphrontDatabaseConnection $conn_w, $limit) {
     return qsprintf($conn_w, 'LIMIT %d', $limit);
   }
 
   private function getLeaseOwnershipName() {
     static $sequence = 0;
 
     $parts = array(
       getmypid(),
       time(),
       php_uname('n'),
       ++$sequence,
     );
 
     return implode(':', $parts);
   }
 
 }
diff --git a/src/infrastructure/events/PhabricatorEvent.php b/src/infrastructure/events/PhabricatorEvent.php
index 03116cdd9e..bfb08b203b 100644
--- a/src/infrastructure/events/PhabricatorEvent.php
+++ b/src/infrastructure/events/PhabricatorEvent.php
@@ -1,44 +1,40 @@
 <?php
 
-
-/**
- * @group events
- */
 final class PhabricatorEvent extends PhutilEvent {
 
   private $user;
   private $aphrontRequest;
   private $conduitRequest;
 
   public function __construct($type, array $data = array()) {
     parent::__construct($type, $data);
   }
 
   public function setUser(PhabricatorUser $user) {
     $this->user = $user;
     return $this;
   }
 
   public function getUser() {
     return $this->user;
   }
 
   public function setAphrontRequest(AphrontRequest $aphront_request) {
     $this->aphrontRequest = $aphront_request;
     return $this;
   }
 
   public function getAphrontRequest() {
     return $this->aphrontRequest;
   }
 
   public function setConduitRequest(ConduitAPIRequest $conduit_request) {
     $this->conduitRequest = $conduit_request;
     return $this;
   }
 
   public function getConduitRequest() {
     return $this->conduitRequest;
   }
 
 }
diff --git a/src/infrastructure/events/PhabricatorExampleEventListener.php b/src/infrastructure/events/PhabricatorExampleEventListener.php
index 4cbbb6b0bb..0a7bd699df 100644
--- a/src/infrastructure/events/PhabricatorExampleEventListener.php
+++ b/src/infrastructure/events/PhabricatorExampleEventListener.php
@@ -1,31 +1,28 @@
 <?php
 
 /**
  * Example event listener. For details about installing Phabricator event hooks,
  * refer to @{article:Events User Guide: Installing Event Listeners}.
- *
- * @group events
  */
 final class PhabricatorExampleEventListener extends PhabricatorEventListener {
 
   public function register() {
     // When your listener is installed, its register() method will be called.
     // You should listen() to any events you are interested in here.
-
     $this->listen(PhabricatorEventType::TYPE_TEST_DIDRUNTEST);
   }
 
   public function handleEvent(PhutilEvent $event) {
     // When an event you have called listen() for in your register() method
     // occurs, this method will be invoked. You should respond to the event.
 
     // In this case, we just echo a message out so the event test script will
     // do something visible.
 
     $console = PhutilConsole::getConsole();
     $console->writeOut(
       "PhabricatorExampleEventListener got test event at %d\n",
       $event->getValue('time'));
   }
 
 }
diff --git a/src/infrastructure/events/constant/PhabricatorEventType.php b/src/infrastructure/events/constant/PhabricatorEventType.php
index 780d894a4b..f33cd4a2d4 100644
--- a/src/infrastructure/events/constant/PhabricatorEventType.php
+++ b/src/infrastructure/events/constant/PhabricatorEventType.php
@@ -1,41 +1,39 @@
 <?php
 
 /**
  * For detailed explanations of these events, see
  * @{article:Events User Guide: Installing Event Listeners}.
- *
- * @group events
  */
 final class PhabricatorEventType extends PhutilEventType {
 
   const TYPE_CONTROLLER_CHECKREQUEST        = 'controller.checkRequest';
 
   const TYPE_MANIPHEST_WILLEDITTASK         = 'maniphest.willEditTask';
   const TYPE_MANIPHEST_DIDEDITTASK          = 'maniphest.didEditTask';
 
   const TYPE_DIFFERENTIAL_WILLMARKGENERATED = 'differential.willMarkGenerated';
 
   const TYPE_DIFFUSION_DIDDISCOVERCOMMIT    = 'diffusion.didDiscoverCommit';
   const TYPE_DIFFUSION_LOOKUPUSER           = 'diffusion.lookupUser';
 
   const TYPE_EDGE_WILLEDITEDGES             = 'edge.willEditEdges';
   const TYPE_EDGE_DIDEDITEDGES              = 'edge.didEditEdges';
 
   const TYPE_TEST_DIDRUNTEST                = 'test.didRunTest';
 
   const TYPE_UI_DIDRENDERACTIONS            = 'ui.didRenderActions';
 
   const TYPE_UI_WILLRENDEROBJECTS           = 'ui.willRenderObjects';
   const TYPE_UI_DDIDRENDEROBJECT            = 'ui.didRenderObject';
   const TYPE_UI_DIDRENDEROBJECTS            = 'ui.didRenderObjects';
   const TYPE_UI_WILLRENDERPROPERTIES        = 'ui.willRenderProperties';
 
   const TYPE_UI_DIDRENDERHOVERCARD          = 'ui.didRenderHovercard';
 
   const TYPE_PEOPLE_DIDRENDERMENU           = 'people.didRenderMenu';
   const TYPE_AUTH_WILLREGISTERUSER          = 'auth.willRegisterUser';
   const TYPE_AUTH_WILLLOGINUSER             = 'auth.willLoginUser';
 
   const TYPE_SEARCH_DIDUPDATEINDEX          = 'search.didUpdateIndex';
 
 }
diff --git a/src/infrastructure/markup/PhabricatorMarkupInterface.php b/src/infrastructure/markup/PhabricatorMarkupInterface.php
index 437d3da8f8..f28c7ab50b 100644
--- a/src/infrastructure/markup/PhabricatorMarkupInterface.php
+++ b/src/infrastructure/markup/PhabricatorMarkupInterface.php
@@ -1,87 +1,85 @@
 <?php
 
 /**
  * An object which has one or more fields containing markup that can be
  * rendered into a display format. Commonly, the fields contain Remarkup and
  * are rendered into HTML. Implementing this interface allows you to render
  * objects through @{class:PhabricatorMarkupEngine} and benefit from caching
  * and pipelining infrastructure.
  *
  * An object may have several "fields" of markup. For example, Differential
  * revisions have a "summary" and a "test plan". In these cases, the `$field`
  * parameter is used to identify which field is being operated on. For simple
  * objects like comments, you might only have one field (say, "body"). In
  * these cases, the implementation can largely ignore the `$field` parameter.
  *
  * @task markup Markup Interface
- *
- * @group markup
  */
 interface PhabricatorMarkupInterface {
 
 
 /* -(  Markup Interface  )--------------------------------------------------- */
 
 
   /**
    * Get a key to identify this field. This should uniquely identify the block
    * of text to be rendered and be usable as a cache key. If the object has a
-   * PHID, using the PHID and the field name is likley reasonable:
+   * PHID, using the PHID and the field name is likely reasonable:
    *
    *   "{$phid}:{$field}"
    *
    * @param string Field name.
    * @return string Cache key up to 125 characters.
    *
    * @task markup
    */
   public function getMarkupFieldKey($field);
 
 
   /**
    * Build the engine the field should use.
    *
    * @param string Field name.
    * @return PhutilRemarkupEngine Markup engine to use.
    * @task markup
    */
   public function newMarkupEngine($field);
 
 
   /**
    * Return the contents of the specified field.
    *
    * @param string Field name.
    * @return string The raw markup contained in the field.
    * @task markup
    */
   public function getMarkupText($field);
 
 
   /**
    * Callback for final postprocessing of output. Normally, you can return
    * the output unmodified.
    *
    * @param string Field name.
    * @param string The finalized output of the engine.
    * @param string The engine which generated the output.
    * @return string Final output.
    * @task markup
    */
   public function didMarkupText(
     $field,
     $output,
     PhutilMarkupEngine $engine);
 
 
   /**
    * Determine if the engine should try to use the markup cache or not.
    * Generally you should use the cache for durable/permanent content but
    * should not use the cache for temporary/draft content.
    *
    * @return bool True to use the markup cache.
    * @task markup
    */
   public function shouldUseMarkupCache($field);
 
 }
diff --git a/src/infrastructure/markup/PhabricatorSyntaxHighlighter.php b/src/infrastructure/markup/PhabricatorSyntaxHighlighter.php
index fbd339a8c5..4906f5bc38 100644
--- a/src/infrastructure/markup/PhabricatorSyntaxHighlighter.php
+++ b/src/infrastructure/markup/PhabricatorSyntaxHighlighter.php
@@ -1,35 +1,31 @@
 <?php
 
-/**
- * @group markup
- */
 final class PhabricatorSyntaxHighlighter {
 
   public static function newEngine() {
     $engine = PhabricatorEnv::newObjectFromConfig('syntax-highlighter.engine');
 
     $config = array(
       'pygments.enabled' => PhabricatorEnv::getEnvConfig('pygments.enabled'),
       'filename.map'     => PhabricatorEnv::getEnvConfig('syntax.filemap'),
     );
 
     foreach ($config as $key => $value) {
       $engine->setConfig($key, $value);
     }
 
     return $engine;
   }
 
   public static function highlightWithFilename($filename, $source) {
     $engine = self::newEngine();
     $language = $engine->getLanguageFromFilename($filename);
     return $engine->highlightSource($language, $source);
   }
 
   public static function highlightWithLanguage($language, $source) {
     $engine = self::newEngine();
     return $engine->highlightSource($language, $source);
   }
 
-
 }
diff --git a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleYoutube.php b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleYoutube.php
index 2627468896..e0057bf3dd 100644
--- a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleYoutube.php
+++ b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleYoutube.php
@@ -1,51 +1,47 @@
 <?php
 
-/**
- * @group markup
- */
-final class PhabricatorRemarkupRuleYoutube
-  extends PhutilRemarkupRule {
+final class PhabricatorRemarkupRuleYoutube extends PhutilRemarkupRule {
 
   public function getPriority() {
     return 350.0;
   }
 
   public function apply($text) {
     $this->uri = new PhutilURI($text);
 
     if ($this->uri->getDomain() &&
         preg_match('/(^|\.)youtube\.com$/', $this->uri->getDomain()) &&
         idx($this->uri->getQueryParams(), 'v')) {
       return $this->markupYoutubeLink();
     }
 
     return $text;
   }
 
   public function markupYoutubeLink() {
     $v = idx($this->uri->getQueryParams(), 'v');
 
     if ($this->getEngine()->isTextMode()) {
       return $this->getEngine()->storeText('http://youtu.be/'.$v);
     }
 
     $youtube_src = 'https://www.youtube.com/embed/'.$v;
     $iframe = $this->newTag(
       'div',
       array(
         'class' => 'embedded-youtube-video',
       ),
       $this->newTag(
         'iframe',
         array(
           'width'       => '650',
           'height'      => '400',
           'style'       => 'margin: 1em auto; border: 0px;',
           'src'         => $youtube_src,
           'frameborder' => 0,
         ),
         ''));
     return $this->getEngine()->storeText($iframe);
   }
 
 }
diff --git a/src/infrastructure/storage/lisk/LiskDAO.php b/src/infrastructure/storage/lisk/LiskDAO.php
index 9250c8b7df..3683e35e6f 100644
--- a/src/infrastructure/storage/lisk/LiskDAO.php
+++ b/src/infrastructure/storage/lisk/LiskDAO.php
@@ -1,1826 +1,1823 @@
 <?php
 
 /**
  * Simple object-authoritative data access object that makes it easy to build
  * stuff that you need to save to a database. Basically, it means that the
  * amount of boilerplate code (and, particularly, boilerplate SQL) you need
  * to write is greatly reduced.
  *
  * Lisk makes it fairly easy to build something quickly and end up with
  * reasonably high-quality code when you're done (e.g., getters and setters,
  * objects, transactions, reasonably structured OO code). It's also very thin:
  * you can break past it and use MySQL and other lower-level tools when you
  * need to in those couple of cases where it doesn't handle your workflow
  * gracefully.
  *
  * However, Lisk won't scale past one database and lacks many of the features
  * of modern DAOs like Hibernate: for instance, it does not support joins or
  * polymorphic storage.
  *
  * This means that Lisk is well-suited for tools like Differential, but often a
  * poor choice elsewhere. And it is strictly unsuitable for many projects.
  *
  * Lisk's model is object-authoritative: the PHP class definition is the
  * master authority for what the object looks like.
  *
  * =Building New Objects=
  *
  * To create new Lisk objects, extend @{class:LiskDAO} and implement
  * @{method:establishLiveConnection}. It should return an
  * @{class:AphrontDatabaseConnection}; this will tell Lisk where to save your
  * objects.
  *
  *   class Dog extends LiskDAO {
  *
  *     protected $name;
  *     protected $breed;
  *
  *     public function establishLiveConnection() {
  *       return $some_connection_object;
  *     }
  *   }
  *
  * Now, you should create your table:
  *
  *   lang=sql
  *   CREATE TABLE dog (
  *     id int unsigned not null auto_increment primary key,
  *     name varchar(32) not null,
  *     breed varchar(32) not null,
  *     dateCreated int unsigned not null,
  *     dateModified int unsigned not null
  *   );
  *
  * For each property in your class, add a column with the same name to the table
  * (see @{method:getConfiguration} for information about changing this mapping).
  * Additionally, you should create the three columns `id`,  `dateCreated` and
  * `dateModified`. Lisk will automatically manage these, using them to implement
  * autoincrement IDs and timestamps. If you do not want to use these features,
  * see @{method:getConfiguration} for information on disabling them. At a bare
  * minimum, you must normally have an `id` column which is a primary or unique
  * key with a numeric type, although you can change its name by overriding
  * @{method:getIDKey} or disable it entirely by overriding @{method:getIDKey} to
  * return null. Note that many methods rely on a single-part primary key and
  * will no longer work (they will throw) if you disable it.
  *
  * As you add more properties to your class in the future, remember to add them
  * to the database table as well.
  *
  * Lisk will now automatically handle these operations: getting and setting
  * properties, saving objects, loading individual objects, loading groups
  * of objects, updating objects, managing IDs, updating timestamps whenever
  * an object is created or modified, and some additional specialized
  * operations.
  *
  * = Creating, Retrieving, Updating, and Deleting =
  *
  * To create and persist a Lisk object, use @{method:save}:
  *
  *   $dog = id(new Dog())
  *     ->setName('Sawyer')
  *     ->setBreed('Pug')
  *     ->save();
  *
  * Note that **Lisk automatically builds getters and setters for all of your
  * object's protected properties** via @{method:__call}. If you want to add
  * custom behavior to your getters or setters, you can do so by overriding the
  * @{method:readField} and @{method:writeField} methods.
  *
  * Calling @{method:save} will persist the object to the database. After calling
  * @{method:save}, you can call @{method:getID} to retrieve the object's ID.
  *
  * To load objects by ID, use the @{method:load} method:
  *
  *   $dog = id(new Dog())->load($id);
  *
- * This will load the Dog record with ID $id into $dog, or ##null## if no such
+ * This will load the Dog record with ID $id into $dog, or `null` if no such
  * record exists (@{method:load} is an instance method rather than a static
  * method because PHP does not support late static binding, at least until PHP
  * 5.3).
  *
  * To update an object, change its properties and save it:
  *
  *   $dog->setBreed('Lab')->save();
  *
  * To delete an object, call @{method:delete}:
  *
  *   $dog->delete();
  *
  * That's Lisk CRUD in a nutshell.
  *
  * = Queries =
  *
  * Often, you want to load a bunch of objects, or execute a more specialized
  * query. Use @{method:loadAllWhere} or @{method:loadOneWhere} to do this:
  *
  *   $pugs = $dog->loadAllWhere('breed = %s', 'Pug');
  *   $sawyer = $dog->loadOneWhere('name = %s', 'Sawyer');
  *
  * These methods work like @{function@libphutil:queryfx}, but only take half of
  * a query (the part after the WHERE keyword). Lisk will handle the connection,
  * columns, and object construction; you are responsible for the rest of it.
  * @{method:loadAllWhere} returns a list of objects, while
  * @{method:loadOneWhere} returns a single object (or `null`).
  *
  * There's also a @{method:loadRelatives} method which helps to prevent the 1+N
  * queries problem.
  *
  * = Managing Transactions =
  *
  * Lisk uses a transaction stack, so code does not generally need to be aware
  * of the transactional state of objects to implement correct transaction
  * semantics:
  *
  *   $obj->openTransaction();
  *     $obj->save();
  *     $other->save();
  *     // ...
  *     $other->openTransaction();
  *       $other->save();
  *       $another->save();
  *     if ($some_condition) {
  *       $other->saveTransaction();
  *     } else {
  *       $other->killTransaction();
  *     }
  *     // ...
  *   $obj->saveTransaction();
  *
  * Assuming ##$obj##, ##$other## and ##$another## live on the same database,
  * this code will work correctly by establishing savepoints.
  *
  * Selects whose data are used later in the transaction should be included in
  * @{method:beginReadLocking} or @{method:beginWriteLocking} block.
  *
  * @task   conn    Managing Connections
  * @task   config  Configuring Lisk
  * @task   load    Loading Objects
  * @task   info    Examining Objects
  * @task   save    Writing Objects
  * @task   hook    Hooks and Callbacks
  * @task   util    Utilities
  * @task   xaction Managing Transactions
  * @task   isolate Isolation for Unit Testing
- *
- * @group storage
  */
 abstract class LiskDAO {
 
   const CONFIG_IDS                  = 'id-mechanism';
   const CONFIG_TIMESTAMPS           = 'timestamps';
   const CONFIG_AUX_PHID             = 'auxiliary-phid';
   const CONFIG_SERIALIZATION        = 'col-serialization';
   const CONFIG_PARTIAL_OBJECTS      = 'partial-objects';
   const CONFIG_BINARY               = 'binary';
 
   const SERIALIZATION_NONE          = 'id';
   const SERIALIZATION_JSON          = 'json';
   const SERIALIZATION_PHP           = 'php';
 
   const IDS_AUTOINCREMENT           = 'ids-auto';
   const IDS_COUNTER                 = 'ids-counter';
   const IDS_MANUAL                  = 'ids-manual';
 
   const COUNTER_TABLE_NAME          = 'lisk_counter';
 
   private $dirtyFields                      = array();
   private $missingFields                    = array();
   private static $processIsolationLevel     = 0;
   private static $transactionIsolationLevel = 0;
 
   private $ephemeral = false;
 
   private static $connections       = array();
 
   private $inSet = null;
 
   protected $id;
   protected $phid;
   protected $dateCreated;
   protected $dateModified;
 
   /**
    *  Build an empty object.
    *
    *  @return obj Empty object.
    */
   public function __construct() {
     $id_key = $this->getIDKey();
     if ($id_key) {
       $this->$id_key = null;
     }
 
     if ($this->getConfigOption(self::CONFIG_PARTIAL_OBJECTS)) {
       $this->resetDirtyFields();
     }
   }
 
 
 /* -(  Managing Connections  )----------------------------------------------- */
 
 
   /**
    * Establish a live connection to a database service. This method should
    * return a new connection. Lisk handles connection caching and management;
    * do not perform caching deeper in the stack.
    *
    * @param string Mode, either 'r' (reading) or 'w' (reading and writing).
    * @return AphrontDatabaseConnection New database connection.
    * @task conn
    */
   abstract protected function establishLiveConnection($mode);
 
 
   /**
    * Return a namespace for this object's connections in the connection cache.
    * Generally, the database name is appropriate. Two connections are considered
    * equivalent if they have the same connection namespace and mode.
    *
    * @return string Connection namespace for cache
    * @task conn
    */
   abstract protected function getConnectionNamespace();
 
 
   /**
    * Get an existing, cached connection for this object.
    *
    * @param mode Connection mode.
    * @return AprontDatabaseConnection|null  Connection, if it exists in cache.
    * @task conn
    */
   protected function getEstablishedConnection($mode) {
     $key = $this->getConnectionNamespace().':'.$mode;
     if (isset(self::$connections[$key])) {
       return self::$connections[$key];
     }
     return null;
   }
 
 
   /**
    * Store a connection in the connection cache.
    *
    * @param mode Connection mode.
    * @param AphrontDatabaseConnection Connection to cache.
    * @return this
    * @task conn
    */
   protected function setEstablishedConnection(
     $mode,
     AphrontDatabaseConnection $connection,
     $force_unique = false) {
 
     $key = $this->getConnectionNamespace().':'.$mode;
 
     if ($force_unique) {
       $key .= ':unique';
       while (isset(self::$connections[$key])) {
         $key .= '!';
       }
     }
 
     self::$connections[$key] = $connection;
     return $this;
   }
 
 
 /* -(  Configuring Lisk  )--------------------------------------------------- */
 
 
   /**
    * Change Lisk behaviors, like ID configuration and timestamps. If you want
    * to change these behaviors, you should override this method in your child
    * class and change the options you're interested in. For example:
    *
    *   public function getConfiguration() {
    *     return array(
    *       Lisk_DataAccessObject::CONFIG_EXAMPLE => true,
    *     ) + parent::getConfiguration();
    *   }
    *
    * The available options are:
    *
    * CONFIG_IDS
    * Lisk objects need to have a unique identifying ID. The three mechanisms
    * available for generating this ID are IDS_AUTOINCREMENT (default, assumes
    * the ID column is an autoincrement primary key), IDS_MANUAL (you are taking
    * full responsibility for ID management), or IDS_COUNTER (see below).
    *
    * InnoDB does not persist the value of `auto_increment` across restarts,
    * and instead initializes it to `MAX(id) + 1` during startup. This means it
    * may reissue the same autoincrement ID more than once, if the row is deleted
    * and then the database is restarted. To avoid this, you can set an object to
    * use a counter table with IDS_COUNTER. This will generally behave like
    * IDS_AUTOINCREMENT, except that the counter value will persist across
    * restarts and inserts will be slightly slower. If a database stores any
    * DAOs which use this mechanism, you must create a table there with this
    * schema:
    *
    *   CREATE TABLE lisk_counter (
    *     counterName VARCHAR(64) COLLATE utf8_bin PRIMARY KEY,
    *     counterValue BIGINT UNSIGNED NOT NULL
    *   ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
    *
    * CONFIG_TIMESTAMPS
    * Lisk can automatically handle keeping track of a `dateCreated' and
    * `dateModified' column, which it will update when it creates or modifies
    * an object. If you don't want to do this, you may disable this option.
    * By default, this option is ON.
    *
    * CONFIG_AUX_PHID
    * This option can be enabled by being set to some truthy value. The meaning
    * of this value is defined by your PHID generation mechanism. If this option
    * is enabled, a `phid' property will be populated with a unique PHID when an
    * object is created (or if it is saved and does not currently have one). You
    * need to override generatePHID() and hook it into your PHID generation
    * mechanism for this to work. By default, this option is OFF.
    *
    * CONFIG_SERIALIZATION
    * You can optionally provide a column serialization map that will be applied
    * to values when they are written to the database. For example:
    *
    *   self::CONFIG_SERIALIZATION => array(
    *     'complex' => self::SERIALIZATION_JSON,
    *   )
    *
    * This will cause Lisk to JSON-serialize the 'complex' field before it is
    * written, and unserialize it when it is read.
    *
    * CONFIG_PARTIAL_OBJECTS
    * Sometimes, it is useful to load only some fields of an object (such as
    * when you are loading all objects of a class, but only care about a few
    * fields). Turning on this option (by setting it to a truthy value) allows
    * users of the class to create/use partial objects, but it comes with some
    * side effects: your class cannot override the setters and getters provided
    * by Lisk (use readField and writeField instead), and you should not
    * directly access or assign protected members of your class (use the getters
    * and setters).
    *
    * CONFIG_BINARY
    * You can optionally provide a map of columns to a flag indicating that
    * they store binary data. These columns will not raise an error when
    * handling binary writes.
    *
    * @return dictionary  Map of configuration options to values.
    *
    * @task   config
    */
   protected function getConfiguration() {
     return array(
       self::CONFIG_IDS                      => self::IDS_AUTOINCREMENT,
       self::CONFIG_TIMESTAMPS               => true,
       self::CONFIG_PARTIAL_OBJECTS          => false,
     );
   }
 
 
   /**
    *  Determine the setting of a configuration option for this class of objects.
    *
    *  @param  const       Option name, one of the CONFIG_* constants.
    *  @return mixed       Option value, if configured (null if unavailable).
    *
    *  @task   config
    */
   public function getConfigOption($option_name) {
     static $options = null;
 
     if (!isset($options)) {
       $options = $this->getConfiguration();
     }
 
     return idx($options, $option_name);
   }
 
 
 /* -(  Loading Objects  )---------------------------------------------------- */
 
 
   /**
    * Load an object by ID. You need to invoke this as an instance method, not
    * a class method, because PHP doesn't have late static binding (until
    * PHP 5.3.0). For example:
    *
    *   $dog = id(new Dog())->load($dog_id);
    *
    * @param  int       Numeric ID identifying the object to load.
    * @return obj|null  Identified object, or null if it does not exist.
    *
    * @task   load
    */
   public function load($id) {
     if (is_object($id)) {
       $id = (string)$id;
     }
 
     if (!$id || (!is_int($id) && !ctype_digit($id))) {
       return null;
     }
 
     return $this->loadOneWhere(
       '%C = %d',
       $this->getIDKeyForUse(),
       $id);
   }
 
 
   /**
    * Loads all of the objects, unconditionally.
    *
    * @return dict    Dictionary of all persisted objects of this type, keyed
    *                 on object ID.
    *
    * @task   load
    */
   public function loadAll() {
     return $this->loadAllWhere('1 = 1');
   }
 
   /**
    * Loads all objects, but only fetches the specified columns.
    *
    * @param  array  Array of canonical column names as strings
    * @return dict   Dictionary of all objects, keyed by ID.
    *
    * @task   load
    */
   public function loadColumns(array $columns) {
     return $this->loadColumnsWhere($columns, '1 = 1');
   }
 
 
   /**
    * Load all objects which match a WHERE clause. You provide everything after
    * the 'WHERE'; Lisk handles everything up to it. For example:
    *
    *   $old_dogs = id(new Dog())->loadAllWhere('age > %d', 7);
    *
    * The pattern and arguments are as per queryfx().
    *
    * @param  string  queryfx()-style SQL WHERE clause.
    * @param  ...     Zero or more conversions.
    * @return dict    Dictionary of matching objects, keyed on ID.
    *
    * @task   load
    */
-  public function loadAllWhere($pattern/* , $arg, $arg, $arg ... */) {
+  public function loadAllWhere($pattern /* , $arg, $arg, $arg ... */) {
     $args = func_get_args();
     array_unshift($args, null);
     $data = call_user_func_array(
       array($this, 'loadRawDataWhere'),
       $args);
     return $this->loadAllFromArray($data);
   }
 
   /**
    * Loads selected columns from objects that match a WHERE clause. You must
    * provide everything after the WHERE. See loadAllWhere().
    *
    * @param  array   List of column names.
    * @param  string  queryfx()-style SQL WHERE clause.
    * @param  ...     Zero or more conversions.
    * @return dict    Dictionary of matching objecks, keyed by ID.
    *
    * @task   load
    */
-  public function loadColumnsWhere(array $columns, $pattern/* , $args... */) {
+  public function loadColumnsWhere(array $columns, $pattern /* , $args... */) {
     if (!$this->getConfigOption(self::CONFIG_PARTIAL_OBJECTS)) {
       throw new BadMethodCallException(
         'This class does not support partial objects.');
     }
     $args = func_get_args();
     $data = call_user_func_array(
       array($this, 'loadRawDataWhere'),
       $args);
     return $this->loadAllFromArray($data);
   }
 
 
   /**
    * Load a single object identified by a 'WHERE' clause. You provide
-   * everything  after the 'WHERE', and Lisk builds the first half of the
+   * everything after the 'WHERE', and Lisk builds the first half of the
    * query. See loadAllWhere(). This method is similar, but returns a single
    * result instead of a list.
    *
    * @param  string    queryfx()-style SQL WHERE clause.
    * @param  ...       Zero or more conversions.
    * @return obj|null  Matching object, or null if no object matches.
    *
    * @task   load
    */
-  public function loadOneWhere($pattern/* , $arg, $arg, $arg ... */) {
+  public function loadOneWhere($pattern /* , $arg, $arg, $arg ... */) {
     $args = func_get_args();
     array_unshift($args, null);
     $data = call_user_func_array(
       array($this, 'loadRawDataWhere'),
       $args);
 
     if (count($data) > 1) {
       throw new AphrontQueryCountException(
         'More than 1 result from loadOneWhere()!');
     }
 
     $data = reset($data);
     if (!$data) {
       return null;
     }
 
     return $this->loadFromArray($data);
   }
 
 
-  protected function loadRawDataWhere($columns, $pattern/* , $args... */) {
+  protected function loadRawDataWhere($columns, $pattern /* , $args... */) {
     $connection = $this->establishConnection('r');
 
     $lock_clause = '';
     if ($connection->isReadLocking()) {
       $lock_clause = 'FOR UPDATE';
     } else if ($connection->isWriteLocking()) {
       $lock_clause = 'LOCK IN SHARE MODE';
     }
 
     $args = func_get_args();
     $args = array_slice($args, 2);
 
     if (!$columns) {
       $column = '*';
     } else {
       $column = '%LC';
       $columns[] = $this->getIDKey();
 
       $properties = $this->getProperties();
       $this->missingFields = array_diff_key(
         array_flip($properties),
         array_flip($columns));
     }
 
     $pattern = 'SELECT '.$column.' FROM %T WHERE '.$pattern.' %Q';
     array_unshift($args, $this->getTableName());
     if ($columns) {
       array_unshift($args, $columns);
     }
     array_push($args, $lock_clause);
     array_unshift($args, $pattern);
 
     return call_user_func_array(
       array($connection, 'queryData'),
       $args);
   }
 
 
   /**
    * Reload an object from the database, discarding any changes to persistent
    * properties. This is primarily useful after entering a transaction but
    * before applying changes to an object.
    *
    * @return this
    *
    * @task   load
    */
   public function reload() {
-
     if (!$this->getID()) {
       throw new Exception("Unable to reload object that hasn't been loaded!");
     }
 
     $result = $this->loadOneWhere(
       '%C = %d',
       $this->getIDKeyForUse(),
       $this->getID());
 
     if (!$result) {
       throw new AphrontQueryObjectMissingException();
     }
 
     return $this;
   }
 
 
   /**
    * Initialize this object's properties from a dictionary. Generally, you
    * load single objects with loadOneWhere(), but sometimes it may be more
    * convenient to pull data from elsewhere directly (e.g., a complicated
-   * join via queryData()) and then load from an array representation.
+   * join via @{method:queryData}) and then load from an array representation.
    *
    * @param  dict  Dictionary of properties, which should be equivalent to
-   *               selecting a row from the table or calling getProperties().
+   *               selecting a row from the table or calling
+   *               @{method:getProperties}.
    * @return this
    *
    * @task   load
    */
   public function loadFromArray(array $row) {
     static $valid_properties = array();
 
     $map = array();
     foreach ($row as $k => $v) {
       // We permit (but ignore) extra properties in the array because a
       // common approach to building the array is to issue a raw SELECT query
       // which may include extra explicit columns or joins.
 
       // This pathway is very hot on some pages, so we're inlining a cache
       // and doing some microoptimization to avoid a strtolower() call for each
       // assignment. The common path (assigning a valid property which we've
       // already seen) always incurs only one empty(). The second most common
       // path (assigning an invalid property which we've already seen) costs
       // an empty() plus an isset().
 
       if (empty($valid_properties[$k])) {
         if (isset($valid_properties[$k])) {
           // The value is set but empty, which means it's false, so we've
           // already determined it's not valid. We don't need to check again.
           continue;
         }
         $valid_properties[$k] = $this->hasProperty($k);
         if (!$valid_properties[$k]) {
           continue;
         }
       }
 
       $map[$k] = $v;
     }
 
     $this->willReadData($map);
 
     foreach ($map as $prop => $value) {
       $this->$prop = $value;
     }
 
     $this->didReadData();
 
     return $this;
   }
 
 
   /**
    * Initialize a list of objects from a list of dictionaries. Usually you
-   * load lists of objects with loadAllWhere(), but sometimes that isn't
-   * flexible enough. One case is if you need to do joins to select the right
-   * objects:
+   * load lists of objects with @{method:loadAllWhere}, but sometimes that
+   * isn't flexible enough. One case is if you need to do joins to select the
+   * right objects:
    *
    *   function loadAllWithOwner($owner) {
    *     $data = $this->queryData(
    *       'SELECT d.*
    *         FROM owner o
    *           JOIN owner_has_dog od ON o.id = od.ownerID
    *           JOIN dog d ON od.dogID = d.id
    *         WHERE o.id = %d',
    *       $owner);
    *     return $this->loadAllFromArray($data);
    *   }
    *
-   * This is a lot messier than loadAllWhere(), but more flexible.
+   * This is a lot messier than @{method:loadAllWhere}, but more flexible.
    *
    * @param  list  List of property dictionaries.
    * @return dict  List of constructed objects, keyed on ID.
    *
    * @task   load
    */
   public function loadAllFromArray(array $rows) {
     $result = array();
 
     $id_key = $this->getIDKey();
 
     foreach ($rows as $row) {
       $obj = clone $this;
       if ($id_key && isset($row[$id_key])) {
         $result[$row[$id_key]] = $obj->loadFromArray($row);
       } else {
         $result[] = $obj->loadFromArray($row);
       }
       if ($this->inSet) {
         $this->inSet->addToSet($obj);
       }
     }
 
     return $result;
   }
 
   /**
    * This method helps to prevent the 1+N queries problem. It happens when you
    * execute a query for each row in a result set. Like in this code:
    *
    *   COUNTEREXAMPLE, name=Easy to write but expensive to execute
    *   $diffs = id(new DifferentialDiff())->loadAllWhere(
    *     'revisionID = %d',
    *     $revision->getID());
    *   foreach ($diffs as $diff) {
    *     $changesets = id(new DifferentialChangeset())->loadAllWhere(
    *       'diffID = %d',
    *       $diff->getID());
    *     // Do something with $changesets.
    *   }
    *
    * One can solve this problem by reading all the dependent objects at once and
    * assigning them later:
    *
    *   COUNTEREXAMPLE, name=Cheaper to execute but harder to write and maintain
    *   $diffs = id(new DifferentialDiff())->loadAllWhere(
    *     'revisionID = %d',
    *     $revision->getID());
    *   $all_changesets = id(new DifferentialChangeset())->loadAllWhere(
    *     'diffID IN (%Ld)',
    *     mpull($diffs, 'getID'));
    *   $all_changesets = mgroup($all_changesets, 'getDiffID');
    *   foreach ($diffs as $diff) {
    *     $changesets = idx($all_changesets, $diff->getID(), array());
    *     // Do something with $changesets.
    *   }
    *
    * The method @{method:loadRelatives} abstracts this approach which allows
    * writing a code which is simple and efficient at the same time:
    *
    *   name=Easy to write and cheap to execute
    *   $diffs = $revision->loadRelatives(new DifferentialDiff(), 'revisionID');
    *   foreach ($diffs as $diff) {
    *     $changesets = $diff->loadRelatives(
    *       new DifferentialChangeset(),
    *       'diffID');
    *     // Do something with $changesets.
    *   }
    *
    * This will load dependent objects for all diffs in the first call of
    * @{method:loadRelatives} and use this result for all following calls.
    *
    * The method supports working with set of sets, like in this code:
    *
    *   $diffs = $revision->loadRelatives(new DifferentialDiff(), 'revisionID');
    *   foreach ($diffs as $diff) {
    *     $changesets = $diff->loadRelatives(
    *       new DifferentialChangeset(),
    *       'diffID');
    *     foreach ($changesets as $changeset) {
    *       $hunks = $changeset->loadRelatives(
    *         new DifferentialHunk(),
    *         'changesetID');
    *       // Do something with hunks.
    *     }
    *   }
    *
    * This code will execute just three queries - one to load all diffs, one to
    * load all their related changesets and one to load all their related hunks.
    * You can try to write an equivalent code without using this method as
    * a homework.
    *
    * The method also supports retrieving referenced objects, for example authors
    * of all diffs (using shortcut @{method:loadOneRelative}):
    *
    *   foreach ($diffs as $diff) {
    *     $author = $diff->loadOneRelative(
    *       new PhabricatorUser(),
    *       'phid',
    *       'getAuthorPHID');
    *     // Do something with author.
    *   }
    *
    * It is also possible to specify additional conditions for the `WHERE`
    * clause. Similarly to @{method:loadAllWhere}, you can specify everything
    * after `WHERE` (except `LIMIT`). Contrary to @{method:loadAllWhere}, it is
    * allowed to pass only a constant string (`%` doesn't have a special
    * meaning). This is intentional to avoid mistakes with using data from one
    * row in retrieving other rows. Example of a correct usage:
    *
    *   $status = $author->loadOneRelative(
    *     new PhabricatorCalendarEvent(),
    *     'userPHID',
    *     'getPHID',
    *     '(UNIX_TIMESTAMP() BETWEEN dateFrom AND dateTo)');
    *
    * @param  LiskDAO  Type of objects to load.
    * @param  string   Name of the column in target table.
    * @param  string   Method name in this table.
    * @param  string   Additional constraints on returned rows. It supports no
    *                  placeholders and requires putting the WHERE part into
    *                  parentheses. It's not possible to use LIMIT.
    * @return list     Objects of type $object.
    *
    * @task   load
    */
   public function loadRelatives(
     LiskDAO $object,
     $foreign_column,
     $key_method = 'getID',
     $where = '') {
 
     if (!$this->inSet) {
       id(new LiskDAOSet())->addToSet($this);
     }
     $relatives = $this->inSet->loadRelatives(
       $object,
       $foreign_column,
       $key_method,
       $where);
     return idx($relatives, $this->$key_method(), array());
   }
 
   /**
    * Load referenced row. See @{method:loadRelatives} for details.
    *
    * @param  LiskDAO  Type of objects to load.
    * @param  string   Name of the column in target table.
    * @param  string   Method name in this table.
    * @param  string   Additional constraints on returned rows. It supports no
    *                  placeholders and requires putting the WHERE part into
    *                  parentheses. It's not possible to use LIMIT.
    * @return LiskDAO  Object of type $object or null if there's no such object.
    *
    * @task   load
    */
   final public function loadOneRelative(
     LiskDAO $object,
     $foreign_column,
     $key_method = 'getID',
     $where = '') {
 
     $relatives = $this->loadRelatives(
       $object,
       $foreign_column,
       $key_method,
       $where);
 
     if (!$relatives) {
       return null;
     }
 
     if (count($relatives) > 1) {
       throw new AphrontQueryCountException(
         'More than 1 result from loadOneRelative()!');
     }
 
     return reset($relatives);
   }
 
   final public function putInSet(LiskDAOSet $set) {
     $this->inSet = $set;
     return $this;
   }
 
   final protected function getInSet() {
     return $this->inSet;
   }
 
 
 /* -(  Examining Objects  )-------------------------------------------------- */
 
 
   /**
    * Set unique ID identifying this object. You normally don't need to call this
    * method unless with `IDS_MANUAL`.
    *
    * @param  mixed   Unique ID.
    * @return this
    * @task   save
    */
   public function setID($id) {
     static $id_key = null;
     if ($id_key === null) {
       $id_key = $this->getIDKeyForUse();
     }
     $this->$id_key = $id;
     return $this;
   }
 
 
   /**
    * Retrieve the unique ID identifying this object. This value will be null if
    * the object hasn't been persisted and you didn't set it manually.
    *
    * @return mixed   Unique ID.
    *
    * @task   info
    */
   public function getID() {
     static $id_key = null;
     if ($id_key === null) {
       $id_key = $this->getIDKeyForUse();
     }
     return $this->$id_key;
   }
 
 
   public function getPHID() {
     return $this->phid;
   }
 
 
   /**
    * Test if a property exists.
    *
    * @param   string    Property name.
    * @return  bool      True if the property exists.
    * @task info
    */
   public function hasProperty($property) {
     return (bool)$this->checkProperty($property);
   }
 
 
   /**
    * Retrieve a list of all object properties. This list only includes
    * properties that are declared as protected, and it is expected that
    * all properties returned by this function should be persisted to the
    * database.
    * Properties that should not be persisted must be declared as private.
    *
    * @return dict  Dictionary of normalized (lowercase) to canonical (original
    *               case) property names.
    *
    * @task   info
    */
   protected function getProperties() {
     static $properties = null;
     if (!isset($properties)) {
       $class = new ReflectionClass(get_class($this));
       $properties = array();
       foreach ($class->getProperties(ReflectionProperty::IS_PROTECTED) as $p) {
         $properties[strtolower($p->getName())] = $p->getName();
       }
 
       $id_key = $this->getIDKey();
       if ($id_key != 'id') {
         unset($properties['id']);
       }
 
       if (!$this->getConfigOption(self::CONFIG_TIMESTAMPS)) {
         unset($properties['datecreated']);
         unset($properties['datemodified']);
       }
 
       if ($id_key != 'phid' && !$this->getConfigOption(self::CONFIG_AUX_PHID)) {
         unset($properties['phid']);
       }
     }
     return $properties;
   }
 
 
   /**
    * Check if a property exists on this object.
    *
    * @return string|null   Canonical property name, or null if the property
    *                       does not exist.
    *
    * @task   info
    */
   protected function checkProperty($property) {
     static $properties = null;
     if ($properties === null) {
       $properties = $this->getProperties();
     }
 
     $property = strtolower($property);
     if (empty($properties[$property])) {
       return null;
     }
 
     return $properties[$property];
   }
 
 
   /**
    * Get or build the database connection for this object.
    *
    * @param  string 'r' for read, 'w' for read/write.
    * @param  bool True to force a new connection. The connection will not
    *              be retrieved from or saved into the connection cache.
    * @return LiskDatabaseConnection   Lisk connection object.
    *
    * @task   info
    */
   public function establishConnection($mode, $force_new = false) {
     if ($mode != 'r' && $mode != 'w') {
       throw new Exception("Unknown mode '{$mode}', should be 'r' or 'w'.");
     }
 
     if (self::shouldIsolateAllLiskEffectsToCurrentProcess()) {
       $mode = 'isolate-'.$mode;
 
       $connection = $this->getEstablishedConnection($mode);
       if (!$connection) {
         $connection = $this->establishIsolatedConnection($mode);
         $this->setEstablishedConnection($mode, $connection);
       }
 
       return $connection;
     }
 
     if (self::shouldIsolateAllLiskEffectsToTransactions()) {
       // If we're doing fixture transaction isolation, force the mode to 'w'
       // so we always get the same connection for reads and writes, and thus
       // can see the writes inside the transaction.
       $mode = 'w';
     }
 
     // TODO: There is currently no protection on 'r' queries against writing.
 
     $connection = null;
     if (!$force_new) {
       if ($mode == 'r') {
         // If we're requesting a read connection but already have a write
         // connection, reuse the write connection so that reads can take place
         // inside transactions.
         $connection = $this->getEstablishedConnection('w');
       }
 
       if (!$connection) {
         $connection = $this->getEstablishedConnection($mode);
       }
     }
 
     if (!$connection) {
       $connection = $this->establishLiveConnection($mode);
       if (self::shouldIsolateAllLiskEffectsToTransactions()) {
         $connection->openTransaction();
       }
       $this->setEstablishedConnection(
         $mode,
         $connection,
         $force_unique = $force_new);
     }
 
     return $connection;
   }
 
 
   /**
    * Convert this object into a property dictionary. This dictionary can be
-   * restored into an object by using loadFromArray() (unless you're using
-   * legacy features with CONFIG_CONVERT_CAMELCASE, but in that case you should
-   * just go ahead and die in a fire).
+   * restored into an object by using @{method:loadFromArray} (unless you're
+   * using legacy features with CONFIG_CONVERT_CAMELCASE, but in that case you
+   * should just go ahead and die in a fire).
    *
    * @return dict  Dictionary of object properties.
    *
    * @task   info
    */
   protected function getPropertyValues() {
     $map = array();
     foreach ($this->getProperties() as $p) {
       // We may receive a warning here for properties we've implicitly added
       // through configuration; squelch it.
       $map[$p] = @$this->$p;
     }
     return $map;
   }
 
 
 /* -(  Writing Objects  )---------------------------------------------------- */
 
 
   /**
    * Make an object read-only.
    *
    * Making an object ephemeral indicates that you will be changing state in
    * such a way that you would never ever want it to be written back to the
    * storage.
    */
   public function makeEphemeral() {
     $this->ephemeral = true;
     return $this;
   }
 
   private function isEphemeralCheck() {
     if ($this->ephemeral) {
       throw new LiskEphemeralObjectException();
     }
   }
 
   /**
    * Persist this object to the database. In most cases, this is the only
    * method you need to call to do writes. If the object has not yet been
    * inserted this will do an insert; if it has, it will do an update.
    *
    * @return this
    *
    * @task   save
    */
   public function save() {
     if ($this->shouldInsertWhenSaved()) {
       return $this->insert();
     } else {
       return $this->update();
     }
   }
 
 
   /**
    * Save this object, forcing the query to use REPLACE regardless of object
    * state.
    *
    * @return this
    *
    * @task   save
    */
   public function replace() {
     $this->isEphemeralCheck();
     return $this->insertRecordIntoDatabase('REPLACE');
   }
 
 
   /**
    *  Save this object, forcing the query to use INSERT regardless of object
    *  state.
    *
    *  @return this
    *
    *  @task   save
    */
   public function insert() {
     $this->isEphemeralCheck();
     return $this->insertRecordIntoDatabase('INSERT');
   }
 
 
   /**
    *  Save this object, forcing the query to use UPDATE regardless of object
    *  state.
    *
    *  @return this
    *
    *  @task   save
    */
   public function update() {
     $this->isEphemeralCheck();
 
     $this->willSaveObject();
     $data = $this->getPropertyValues();
     if ($this->getConfigOption(self::CONFIG_PARTIAL_OBJECTS)) {
       $data = array_intersect_key($data, $this->dirtyFields);
     }
     $this->willWriteData($data);
 
     $map = array();
     foreach ($data as $k => $v) {
       $map[$k] = $v;
     }
 
     $conn = $this->establishConnection('w');
     $binary = $this->getBinaryColumns();
 
     foreach ($map as $key => $value) {
       if (!empty($binary[$key])) {
         $map[$key] = qsprintf($conn, '%C = %nB', $key, $value);
       } else {
         $map[$key] = qsprintf($conn, '%C = %ns', $key, $value);
       }
     }
     $map = implode(', ', $map);
 
     $id = $this->getID();
     $conn->query(
       'UPDATE %T SET %Q WHERE %C = '.(is_int($id) ? '%d' : '%s'),
       $this->getTableName(),
       $map,
       $this->getIDKeyForUse(),
       $id);
     // We can't detect a missing object because updating an object without
     // changing any values doesn't affect rows. We could jiggle timestamps
     // to catch this for objects which track them if we wanted.
 
     $this->didWriteData();
 
     if ($this->getConfigOption(self::CONFIG_PARTIAL_OBJECTS)) {
       $this->resetDirtyFields();
     }
 
     return $this;
   }
 
 
   /**
    * Delete this object, permanently.
    *
    * @return this
    *
    * @task   save
    */
   public function delete() {
     $this->isEphemeralCheck();
     $this->willDelete();
 
     $conn = $this->establishConnection('w');
     $conn->query(
       'DELETE FROM %T WHERE %C = %d',
       $this->getTableName(),
       $this->getIDKeyForUse(),
       $this->getID());
 
     $this->didDelete();
 
     return $this;
   }
 
   /**
    * Internal implementation of INSERT and REPLACE.
    *
    * @param  const   Either "INSERT" or "REPLACE", to force the desired mode.
    *
    * @task   save
    */
   protected function insertRecordIntoDatabase($mode) {
     $this->willSaveObject();
     $data = $this->getPropertyValues();
 
     $conn = $this->establishConnection('w');
 
     $id_mechanism = $this->getConfigOption(self::CONFIG_IDS);
     switch ($id_mechanism) {
       case self::IDS_AUTOINCREMENT:
         // If we are using autoincrement IDs, let MySQL assign the value for the
         // ID column, if it is empty. If the caller has explicitly provided a
         // value, use it.
         $id_key = $this->getIDKeyForUse();
         if (empty($data[$id_key])) {
           unset($data[$id_key]);
         }
         break;
       case self::IDS_COUNTER:
         // If we are using counter IDs, assign a new ID if we don't already have
         // one.
         $id_key = $this->getIDKeyForUse();
         if (empty($data[$id_key])) {
           $counter_name = $this->getTableName();
           $id = self::loadNextCounterID($conn, $counter_name);
           $this->setID($id);
           $data[$id_key] = $id;
         }
         break;
       case self::IDS_MANUAL:
         break;
       default:
         throw new Exception('Unknown CONFIG_IDs mechanism!');
     }
 
     $this->willWriteData($data);
 
     $columns = array_keys($data);
     $binary = $this->getBinaryColumns();
 
     foreach ($data as $key => $value) {
       try {
         if (!empty($binary[$key])) {
           $data[$key] = qsprintf($conn, '%nB', $value);
         } else {
           $data[$key] = qsprintf($conn, '%ns', $value);
         }
       } catch (AphrontQueryParameterException $parameter_exception) {
         throw new PhutilProxyException(
           pht(
             "Unable to insert or update object of class %s, field '%s' ".
             "has a nonscalar value.",
             get_class($this),
             $key),
           $parameter_exception);
       }
     }
     $data = implode(', ', $data);
 
     $conn->query(
       '%Q INTO %T (%LC) VALUES (%Q)',
       $mode,
       $this->getTableName(),
       $columns,
       $data);
 
     // Only use the insert id if this table is using auto-increment ids
     if ($id_mechanism === self::IDS_AUTOINCREMENT) {
       $this->setID($conn->getInsertID());
     }
 
     $this->didWriteData();
 
     if ($this->getConfigOption(self::CONFIG_PARTIAL_OBJECTS)) {
       $this->resetDirtyFields();
     }
 
     return $this;
   }
 
 
   /**
    * Method used to determine whether to insert or update when saving.
    *
    * @return bool true if the record should be inserted
    */
   protected function shouldInsertWhenSaved() {
     $key_type = $this->getConfigOption(self::CONFIG_IDS);
 
     if ($key_type == self::IDS_MANUAL) {
       throw new Exception(
         'You are using manual IDs. You must override the '.
         'shouldInsertWhenSaved() method to properly detect '.
         'when to insert a new record.');
     } else {
       return !$this->getID();
     }
   }
 
 
 /* -(  Hooks and Callbacks  )------------------------------------------------ */
 
 
   /**
    * Retrieve the database table name. By default, this is the class name.
    *
    * @return string  Table name for object storage.
    *
    * @task   hook
    */
   public function getTableName() {
     return get_class($this);
   }
 
 
   /**
    * Retrieve the primary key column, "id" by default. If you can not
    * reasonably name your ID column "id", override this method.
    *
    * @return string  Name of the ID column.
    *
    * @task   hook
    */
   public function getIDKey() {
     return 'id';
   }
 
 
   protected function getIDKeyForUse() {
     $id_key = $this->getIDKey();
     if (!$id_key) {
       throw new Exception(
         'This DAO does not have a single-part primary key. The method you '.
         'called requires a single-part primary key.');
     }
     return $id_key;
   }
 
 
   /**
    * Generate a new PHID, used by CONFIG_AUX_PHID.
    *
    * @return phid    Unique, newly allocated PHID.
    *
    * @task   hook
    */
   protected function generatePHID() {
     throw new Exception(
       'To use CONFIG_AUX_PHID, you need to overload '.
       'generatePHID() to perform PHID generation.');
   }
 
 
   /**
    * Hook to apply serialization or validation to data before it is written to
-   * the database. See also willReadData().
+   * the database. See also @{method:willReadData}.
    *
    * @task hook
    */
   protected function willWriteData(array &$data) {
     $this->applyLiskDataSerialization($data, false);
   }
 
 
   /**
    * Hook to perform actions after data has been written to the database.
    *
    * @task hook
    */
   protected function didWriteData() {}
 
 
   /**
    * Hook to make internal object state changes prior to INSERT, REPLACE or
    * UPDATE.
    *
    * @task hook
    */
   protected function willSaveObject() {
     $use_timestamps = $this->getConfigOption(self::CONFIG_TIMESTAMPS);
 
     if ($use_timestamps) {
       if (!$this->getDateCreated()) {
         $this->setDateCreated(time());
       }
       $this->setDateModified(time());
     }
 
     if ($this->getConfigOption(self::CONFIG_AUX_PHID) && !$this->getPHID()) {
       $this->setPHID($this->generatePHID());
     }
   }
 
 
   /**
    * Hook to apply serialization or validation to data as it is read from the
-   * database. See also willWriteData().
+   * database. See also @{method:willWriteData}.
    *
    * @task hook
    */
   protected function willReadData(array &$data) {
     $this->applyLiskDataSerialization($data, $deserialize = true);
   }
 
   /**
    * Hook to perform an action on data after it is read from the database.
    *
    * @task hook
    */
   protected function didReadData() {}
 
   /**
    * Hook to perform an action before the deletion of an object.
    *
    * @task hook
    */
   protected function willDelete() {}
 
   /**
    * Hook to perform an action after the deletion of an object.
    *
    * @task hook
    */
   protected function didDelete() {}
 
   /**
    * Reads the value from a field. Override this method for custom behavior
-   * of getField() instead of overriding getField directly.
+   * of @{method:getField} instead of overriding getField directly.
    *
    * @param  string  Canonical field name
    * @return mixed   Value of the field
    *
    * @task hook
    */
   protected function readField($field) {
     if (isset($this->$field)) {
       return $this->$field;
     }
     return null;
   }
 
   /**
    * Writes a value to a field. Override this method for custom behavior of
    * setField($value) instead of overriding setField directly.
    *
    * @param  string  Canonical field name
    * @param  mixed   Value to write
    *
    * @task hook
    */
   protected function writeField($field, $value) {
     $this->$field = $value;
   }
 
 
 /* -(  Manging Transactions  )----------------------------------------------- */
 
 
   /**
    * Increase transaction stack depth.
    *
    * @return this
    */
   public function openTransaction() {
     $this->establishConnection('w')->openTransaction();
     return $this;
   }
 
 
   /**
    * Decrease transaction stack depth, saving work.
    *
    * @return this
    */
   public function saveTransaction() {
     $this->establishConnection('w')->saveTransaction();
     return $this;
   }
 
 
   /**
    * Decrease transaction stack depth, discarding work.
    *
    * @return this
    */
   public function killTransaction() {
     $this->establishConnection('w')->killTransaction();
     return $this;
   }
 
 
   /**
    * Begins read-locking selected rows with SELECT ... FOR UPDATE, so that
    * other connections can not read them (this is an enormous oversimplification
    * of FOR UPDATE semantics; consult the MySQL documentation for details). To
    * end read locking, call @{method:endReadLocking}. For example:
    *
    *   $beach->openTransaction();
    *     $beach->beginReadLocking();
    *
    *       $beach->reload();
    *       $beach->setGrainsOfSand($beach->getGrainsOfSand() + 1);
    *       $beach->save();
    *
    *     $beach->endReadLocking();
    *   $beach->saveTransaction();
    *
    * @return this
    * @task xaction
    */
   public function beginReadLocking() {
     $this->establishConnection('w')->beginReadLocking();
     return $this;
   }
 
 
   /**
    * Ends read-locking that began at an earlier @{method:beginReadLocking} call.
    *
    * @return this
    * @task xaction
    */
   public function endReadLocking() {
     $this->establishConnection('w')->endReadLocking();
     return $this;
   }
 
   /**
    * Begins write-locking selected rows with SELECT ... LOCK IN SHARE MODE, so
    * that other connections can not update or delete them (this is an
    * oversimplification of LOCK IN SHARE MODE semantics; consult the
    * MySQL documentation for details). To end write locking, call
    * @{method:endWriteLocking}.
    *
    * @return this
    * @task xaction
    */
   public function beginWriteLocking() {
     $this->establishConnection('w')->beginWriteLocking();
     return $this;
   }
 
 
   /**
    * Ends write-locking that began at an earlier @{method:beginWriteLocking}
    * call.
    *
    * @return this
    * @task xaction
    */
   public function endWriteLocking() {
     $this->establishConnection('w')->endWriteLocking();
     return $this;
   }
 
 
 /* -(  Isolation  )---------------------------------------------------------- */
 
 
   /**
    * @task isolate
    */
   public static function beginIsolateAllLiskEffectsToCurrentProcess() {
     self::$processIsolationLevel++;
   }
 
   /**
    * @task isolate
    */
   public static function endIsolateAllLiskEffectsToCurrentProcess() {
     self::$processIsolationLevel--;
     if (self::$processIsolationLevel < 0) {
       throw new Exception(
         'Lisk process isolation level was reduced below 0.');
     }
   }
 
   /**
    * @task isolate
    */
   public static function shouldIsolateAllLiskEffectsToCurrentProcess() {
     return (bool)self::$processIsolationLevel;
   }
 
   /**
    * @task isolate
    */
   private function establishIsolatedConnection($mode) {
     $config = array();
     return new AphrontIsolatedDatabaseConnection($config);
   }
 
   /**
    * @task isolate
    */
   public static function beginIsolateAllLiskEffectsToTransactions() {
     if (self::$transactionIsolationLevel === 0) {
       self::closeAllConnections();
     }
     self::$transactionIsolationLevel++;
   }
 
   /**
    * @task isolate
    */
   public static function endIsolateAllLiskEffectsToTransactions() {
     self::$transactionIsolationLevel--;
     if (self::$transactionIsolationLevel < 0) {
       throw new Exception(
         'Lisk transaction isolation level was reduced below 0.');
     } else if (self::$transactionIsolationLevel == 0) {
       foreach (self::$connections as $key => $conn) {
         if ($conn) {
           $conn->killTransaction();
         }
       }
       self::closeAllConnections();
     }
   }
 
   /**
    * @task isolate
    */
   public static function shouldIsolateAllLiskEffectsToTransactions() {
     return (bool)self::$transactionIsolationLevel;
   }
 
   public static function closeAllConnections() {
     self::$connections = array();
   }
 
 /* -(  Utilities  )---------------------------------------------------------- */
 
 
   /**
    * Applies configured serialization to a dictionary of values.
    *
    * @task util
    */
   protected function applyLiskDataSerialization(array &$data, $deserialize) {
     $serialization = $this->getConfigOption(self::CONFIG_SERIALIZATION);
     if ($serialization) {
       foreach (array_intersect_key($serialization, $data) as $col => $format) {
         switch ($format) {
           case self::SERIALIZATION_NONE:
             break;
           case self::SERIALIZATION_PHP:
             if ($deserialize) {
               $data[$col] = unserialize($data[$col]);
             } else {
               $data[$col] = serialize($data[$col]);
             }
             break;
           case self::SERIALIZATION_JSON:
             if ($deserialize) {
               $data[$col] = json_decode($data[$col], true);
             } else {
               $data[$col] = json_encode($data[$col]);
             }
             break;
           default:
             throw new Exception("Unknown serialization format '{$format}'.");
         }
       }
     }
   }
 
   /**
    * Resets the dirty fields (fields which need to be written on next save/
    * update/insert/replace). If this DAO has timestamps, the modified time
    * is always a dirty field.
    *
    * @task util
    */
   private function resetDirtyFields() {
     $this->dirtyFields = array();
     if ($this->getConfigOption(self::CONFIG_TIMESTAMPS)) {
       $this->dirtyFields['dateModified'] = true;
     }
   }
 
   /**
    * Black magic. Builds implied get*() and set*() for all properties.
    *
    * @param  string  Method name.
    * @param  list    Argument vector.
    * @return mixed   get*() methods return the property value. set*() methods
    *                 return $this.
    * @task   util
    */
   public function __call($method, $args) {
-
     // NOTE: PHP has a bug that static variables defined in __call() are shared
     // across all children classes. Call a different method to work around this
     // bug.
     return $this->call($method, $args);
   }
 
   /**
    * @task   util
    */
   final protected function call($method, $args) {
     // NOTE: This method is very performance-sensitive (many thousands of calls
     // per page on some pages), and thus has some silliness in the name of
     // optimizations.
 
     static $dispatch_map = array();
     static $partial = null;
     if ($partial === null) {
       $partial = $this->getConfigOption(self::CONFIG_PARTIAL_OBJECTS);
     }
 
     if ($method[0] === 'g') {
       if (isset($dispatch_map[$method])) {
         $property = $dispatch_map[$method];
       } else {
         if (substr($method, 0, 3) !== 'get') {
           throw new Exception("Unable to resolve method '{$method}'!");
         }
         $property = substr($method, 3);
         if (!($property = $this->checkProperty($property))) {
           throw new Exception("Bad getter call: {$method}");
         }
         $dispatch_map[$method] = $property;
       }
 
       if ($partial && isset($this->missingFields[$property])) {
         throw new Exception("Cannot get field that wasn't loaded: {$property}");
       }
 
       return $this->readField($property);
     }
 
     if ($method[0] === 's') {
       if (isset($dispatch_map[$method])) {
         $property = $dispatch_map[$method];
       } else {
         if (substr($method, 0, 3) !== 'set') {
           throw new Exception("Unable to resolve method '{$method}'!");
         }
         $property = substr($method, 3);
         $property = $this->checkProperty($property);
         if (!$property) {
           throw new Exception("Bad setter call: {$method}");
         }
         $dispatch_map[$method] = $property;
       }
       if ($partial) {
         // Accept writes to fields that weren't initially loaded
         unset($this->missingFields[$property]);
         $this->dirtyFields[$property] = true;
       }
 
       $this->writeField($property, $args[0]);
 
       return $this;
     }
 
     throw new Exception("Unable to resolve method '{$method}'.");
   }
 
   /**
    * Warns against writing to undeclared property.
    *
    * @task   util
    */
   public function __set($name, $value) {
     phlog('Wrote to undeclared property '.get_class($this).'::$'.$name.'.');
     $this->$name = $value;
   }
 
   /**
    * Increments a named counter and returns the next value.
    *
    * @param   AphrontDatabaseConnection   Database where the counter resides.
    * @param   string                      Counter name to create or increment.
    * @return  int                         Next counter value.
    *
    * @task util
    */
   public static function loadNextCounterID(
     AphrontDatabaseConnection $conn_w,
     $counter_name) {
 
     // NOTE: If an insert does not touch an autoincrement row or call
     // LAST_INSERT_ID(), MySQL normally does not change the value of
     // LAST_INSERT_ID(). This can cause a counter's value to leak to a
     // new counter if the second counter is created after the first one is
     // updated. To avoid this, we insert LAST_INSERT_ID(1), to ensure the
     // LAST_INSERT_ID() is always updated and always set correctly after the
     // query completes.
 
     queryfx(
       $conn_w,
       'INSERT INTO %T (counterName, counterValue) VALUES
           (%s, LAST_INSERT_ID(1))
         ON DUPLICATE KEY UPDATE
           counterValue = LAST_INSERT_ID(counterValue + 1)',
       self::COUNTER_TABLE_NAME,
       $counter_name);
 
     return $conn_w->getInsertID();
   }
 
   private function getBinaryColumns() {
     return $this->getConfigOption(self::CONFIG_BINARY);
   }
 
 }
diff --git a/webroot/rsrc/externals/javelin/core/Event.js b/webroot/rsrc/externals/javelin/core/Event.js
index b7b5a7b3b2..9ce02c5811 100644
--- a/webroot/rsrc/externals/javelin/core/Event.js
+++ b/webroot/rsrc/externals/javelin/core/Event.js
@@ -1,347 +1,346 @@
 /**
  * @requires javelin-install
  * @provides javelin-event
  * @javelin
  */
 
 /**
  * A generic event, routed by @{class:JX.Stratcom}. All events within Javelin
  * are represented by a {@class:JX.Event}, regardless of whether they originate
  * from a native DOM event (like a mouse click) or are custom application
  * events.
  *
  * See @{article:Concepts: Event Delegation} for an introduction to Javelin's
  * event delegation model.
  *
  * Events have a propagation model similar to native Javascript events, in that
  * they can be stopped with stop() (which stops them from continuing to
  * propagate to other handlers) or prevented with prevent() (which prevents them
  * from taking their default action, like following a link). You can do both at
  * once with kill().
  *
  * @task stop Stopping Event Behaviors
  * @task info Getting Event Information
- * @group event
  */
 JX.install('Event', {
   members : {
 
     /**
      * Stop an event from continuing to propagate. No other handler will
      * receive this event, but its default behavior will still occur. See
      * ""Using Events"" for more information on the distinction between
      * 'stopping' and 'preventing' an event. See also prevent() (which prevents
      * an event but does not stop it) and kill() (which stops and prevents an
      * event).
      *
      * @return this
      * @task stop
      */
     stop : function() {
       var r = this.getRawEvent();
       if (r) {
         r.cancelBubble = true;
         r.stopPropagation && r.stopPropagation();
       }
       this.setStopped(true);
       return this;
     },
 
 
     /**
      * Prevent an event's default action. This depends on the event type, but
      * the common default actions are following links, submitting forms,
      * and typing text. Event prevention is generally used when you have a link
      * or form which work properly without Javascript but have a specialized
      * Javascript behavior. When you intercept the event and make the behavior
      * occur, you prevent it to keep the browser from following the link.
      *
      * Preventing an event does not stop it from propagating, so other handlers
      * will still receive it. See ""Using Events"" for more information on the
      * distinction between 'stopping' and 'preventing' an event. See also
      * stop() (which stops an event but does not prevent it) and kill()
      * (which stops and prevents an event).
      *
      * @return this
      * @task stop
      */
     prevent : function() {
       var r = this.getRawEvent();
       if (r) {
         r.returnValue = false;
         r.preventDefault && r.preventDefault();
       }
       this.setPrevented(true);
       return this;
     },
 
 
     /**
      * Stop and prevent an event, which stops it from propagating and prevents
      * its defualt behavior. This is a convenience function, see stop() and
      * prevent() for information on what it means to stop or prevent an event.
      *
      * @return this
      * @task stop
      */
     kill : function() {
       this.prevent();
       this.stop();
       return this;
     },
 
 
     /**
      * Get the special key (like tab or return), if any,  associated with this
      * event. Browsers report special keys differently;  this method allows you
      * to identify a keypress in a browser-agnostic way. Note that this detects
      * only some special keys: delete, tab, return escape, left, up, right,
      * down.
      *
      * For example, if you want to react to the escape key being pressed, you
      * could install a listener like this:
      *
      *  JX.Stratcom.listen('keydown', 'example', function(e) {
      *    if (e.getSpecialKey() == 'esc') {
      *      JX.log("You pressed 'Escape'! Well done! Bravo!");
      *    }
      *  });
      *
      * @return string|null ##null## if there is no associated special key,
      *                     or one of the strings 'delete', 'tab', 'return',
      *                     'esc', 'left', 'up', 'right', or 'down'.
      * @task info
      */
     getSpecialKey : function() {
       var r = this.getRawEvent();
       if (!r) {
         return null;
       }
 
       return JX.Event._keymap[r.keyCode] || null;
     },
 
 
     /**
      * Get whether the mouse button associated with the mouse event is the
      * right-side button in a browser-agnostic way.
      *
      * @return bool
      * @task info
      */
     isRightButton : function() {
       var r = this.getRawEvent();
       return r.which == 3 || r.button == 2;
     },
 
     /**
      * Determine if a mouse event is a normal event (left mouse button, no
      * modifier keys).
      *
      * @return bool
      * @task info
      */
     isNormalMouseEvent : function() {
       var supportedEvents = {'click': 1, 'mouseup': 1, 'mousedown': 1};
       if (!(this.getType() in supportedEvents)) {
         return false;
       }
 
       var r = this.getRawEvent();
 
       if (r.metaKey || r.altKey || r.ctrlKey || r.shiftKey) {
         return false;
       }
 
       if (('which' in r) && (r.which != 1)) {
         return false;
       }
 
       if (('button' in r) && r.button) {
         if ('which' in r) {
           return false;
         // IE won't have which and has left click == 1 here
         } else if (r.button != 1) {
           return false;
         }
       }
 
       return true;
     },
 
 
     /**
      * Determine if a click event is a normal click (left mouse button, no
      * modifier keys).
      *
      * @return bool
      * @task info
      */
     isNormalClick : function() {
       if (this.getType() != 'click') {
         return false;
       }
 
       return this.isNormalMouseEvent();
     },
 
 
     /**
      * Get the node corresponding to the specified key in this event's node map.
      * This is a simple helper method that makes the API for accessing nodes
      * less ugly.
      *
      *  JX.Stratcom.listen('click', 'tag:a', function(e) {
      *    var a = e.getNode('tag:a');
      *    // do something with the link that was clicked
      *  });
      *
      * @param  string     sigil or stratcom node key
      * @return node|null  Node mapped to the specified key, or null if it the
      *                    key does not exist. The available keys include:
      *                    - 'tag:'+tag - first node of each type
      *                    - 'id:'+id - all nodes with an id
      *                    - sigil - first node of each sigil
      * @task info
      */
     getNode : function(key) {
       return this.getNodes()[key] || null;
     },
 
 
     /**
      * Get the metadata associated with the node that corresponds to the key
-     * in this event's node map.  This is a simple helper method that makes
+     * in this event's node map. This is a simple helper method that makes
      * the API for accessing metadata associated with specific nodes less ugly.
      *
      *  JX.Stratcom.listen('click', 'tag:a', function(event) {
      *    var anchorData = event.getNodeData('tag:a');
      *    // do something with the metadata of the link that was clicked
      *  });
      *
      * @param  string   sigil or stratcom node key
      * @return dict     dictionary of the node's metadata
      * @task info
      */
     getNodeData : function(key) {
       // Evade static analysis - JX.Stratcom
       return JX['Stratcom'].getData(this.getNode(key));
     }
   },
 
   statics : {
     _keymap : {
       8     : 'delete',
       9     : 'tab',
       // On Windows and Linux, Chrome sends '10' for return. On Mac OS X, it
       // sends 13. Other browsers evidence varying degrees of diversity in their
       // behavior. Treat '10' and '13' identically.
       10    : 'return',
       13    : 'return',
       27    : 'esc',
       37    : 'left',
       38    : 'up',
       39    : 'right',
       40    : 'down',
       63232 : 'up',
       63233 : 'down',
       62234 : 'left',
       62235 : 'right'
     }
   },
 
   properties : {
 
     /**
      * Native Javascript event which generated this @{class:JX.Event}. Not every
      * event is generated by a native event, so there may be ##null## in
      * this field.
      *
      * @type Event|null
      * @task info
      */
     rawEvent : null,
 
     /**
      * String describing the event type, like 'click' or 'mousedown'. This
      * may also be an application or object event.
      *
      * @type string
      * @task info
      */
     type : null,
 
     /**
      * If available, the DOM node where this event occurred. For example, if
      * this event is a click on a button, the target will be the button which
      * was clicked. Application events will not have a target, so this property
      * will return the value ##null##.
      *
      * @type DOMNode|null
      * @task info
      */
     target : null,
 
     /**
      * Metadata attached to nodes associated with this event.
      *
      * For native events, the DOM is walked from the event target to the root
      * element. Each sigil which is encountered while walking up the tree is
      * added to the map as a key. If the node has associated metainformation,
      * it is set as the value; otherwise, the value is null.
      *
      * @type dict<string, *>
      * @task info
      */
     data : null,
 
     /**
      * Sigil path this event was activated from. TODO: explain this
      *
      * @type list<string>
      * @task info
      */
     path : [],
 
     /**
      * True if propagation of the event has been stopped. See stop().
      *
      * @type bool
      * @task stop
      */
     stopped : false,
 
     /**
      * True if default behavior of the event has been prevented. See prevent().
      *
      * @type bool
      * @task stop
      */
     prevented : false,
 
     /**
      * @task info
      */
     nodes : {},
 
     /**
      * @task info
      */
     nodeDistances : {}
   },
 
   /**
    * @{class:JX.Event} installs a toString() method in ##__DEV__## which allows
    * you to log or print events and get a reasonable representation of them:
    *
    *  Event<'click', ['path', 'stuff'], [object HTMLDivElement]>
    */
   initialize : function() {
     if (__DEV__) {
       JX.Event.prototype.toString = function() {
         var path = '['+this.getPath().join(', ')+']';
         return 'Event<'+this.getType()+', '+path+', '+this.getTarget()+'>';
       };
     }
   }
 });
diff --git a/webroot/rsrc/externals/javelin/core/Stratcom.js b/webroot/rsrc/externals/javelin/core/Stratcom.js
index dc62c852de..28eff44c12 100644
--- a/webroot/rsrc/externals/javelin/core/Stratcom.js
+++ b/webroot/rsrc/externals/javelin/core/Stratcom.js
@@ -1,646 +1,645 @@
 /**
  * @requires javelin-install javelin-event javelin-util javelin-magical-init
  * @provides javelin-stratcom
  * @javelin
  */
 
 /**
  * Javelin strategic command, the master event delegation core. This class is
  * a sort of hybrid between Arbiter and traditional event delegation, and
  * serves to route event information to handlers in a general way.
  *
  * Each Javelin :JX.Event has a 'type', which may be a normal Javascript type
  * (for instance, a click or a keypress) or an application-defined type. It
  * also has a "path", based on the path in the DOM from the root node to the
  * event target. Note that, while the type is required, the path may be empty
  * (it often will be for application-defined events which do not originate
  * from the DOM).
  *
  * The path is determined by walking down the tree to the event target and
  * looking for nodes that have been tagged with metadata. These names are used
  * to build the event path, and unnamed nodes are ignored. Each named node may
  * also have data attached to it.
  *
  * Listeners specify one or more event types they are interested in handling,
  * and, optionally, one or more paths. A listener will only receive events
  * which occurred on paths it is listening to. See listen() for more details.
  *
  * @task invoke   Invoking Events
  * @task listen   Listening to Events
  * @task handle   Responding to Events
  * @task sigil    Managing Sigils
  * @task meta     Managing Metadata
  * @task internal Internals
- * @group event
  */
 JX.install('Stratcom', {
   statics : {
     ready : false,
     _targets : {},
     _handlers : [],
     _need : {},
     _auto : '*',
     _data : {},
     _execContext : [],
 
     /**
      * Node metadata is stored in a series of blocks to prevent collisions
      * between indexes that are generated on the server side (and potentially
      * concurrently). Block 0 is for metadata on the initial page load, block 1
      * is for metadata added at runtime with JX.Stratcom.siglize(), and blocks
      * 2 and up are for metadata generated from other sources (e.g. JX.Request).
      * Use allocateMetadataBlock() to reserve a block, and mergeData() to fill
      * a block with data.
      *
      * When a JX.Request is sent, a block is allocated for it and any metadata
      * it returns is filled into that block.
      */
     _dataBlock : 2,
 
     /**
      * Within each datablock, data is identified by a unique index. The data
      * pointer (data-meta attribute) on a node looks like this:
      *
      *  1_2
      *
      * ...where 1 is the block, and 2 is the index within that block. Normally,
      * blocks are filled on the server side, so index allocation takes place
      * there. However, when data is provided with JX.Stratcom.addData(), we
      * need to allocate indexes on the client.
      */
     _dataIndex : 0,
 
     /**
      * Dispatch a simple event that does not have a corresponding native event
      * object. It is unusual to call this directly. Generally, you will instead
      * dispatch events from an object using the invoke() method present on all
      * objects. See @{JX.Base.invoke()} for documentation.
      *
      * @param  string       Event type.
      * @param  string|list? Optionally, a sigil path to attach to the event.
      *                      This is rarely meaningful for simple events.
      * @param  object?      Optionally, arbitrary data to send with the event.
      * @return @{JX.Event}  The event object which was dispatched to listeners.
      *                      The main use of this is to test whether any
      *                      listeners prevented the event.
      * @task invoke
      */
     invoke : function(type, path, data) {
       if (__DEV__) {
         if (path && typeof path !== 'string' && !JX.isArray(path)) {
           throw new Error(
             'JX.Stratcom.invoke(...): path must be a string or an array.');
         }
       }
 
       path = JX.$AX(path);
 
       return this._dispatchProxy(
         new JX.Event()
           .setType(type)
           .setData(data || {})
           .setPath(path || [])
       );
     },
 
 
     /**
      * Listen for events on given paths. Specify one or more event types, and
      * zero or more paths to filter on. If you don't specify a path, you will
      * receive all events of the given type:
      *
      *   // Listen to all clicks.
      *   JX.Stratcom.listen('click', null, handler);
      *
      * This will notify you of all clicks anywhere in the document (unless
      * they are intercepted and killed by a higher priority handler before they
      * get to you).
      *
      * Often, you may be interested in only clicks on certain elements. You
      * can specify the paths you're interested in to filter out events which
      * you do not want to be notified of.
      *
      *   //  Listen to all clicks inside elements annotated "news-feed".
      *   JX.Stratcom.listen('click', 'news-feed', handler);
      *
      * By adding more elements to the path, you can create a finer-tuned
      * filter:
      *
      *   //  Listen to only "like" clicks inside "news-feed".
      *   JX.Stratcom.listen('click', ['news-feed', 'like'], handler);
      *
      *
      * TODO: Further explain these shenanigans.
      *
      * @param  string|list<string>  Event type (or list of event names) to
      *                   listen for. For example, ##'click'## or
      *                   ##['keydown', 'keyup']##.
      *
      * @param  wild      Sigil paths to listen for this event on. See discussion
      *                   in method documentation.
      *
      * @param  function  Callback to invoke when this event is triggered. It
      *                   should have the signature ##f(:JX.Event e)##.
      *
      * @return object    A reference to the installed listener. You can later
      *                   remove the listener by calling this object's remove()
      *                   method.
      * @task listen
      */
     listen : function(types, paths, func) {
 
       if (__DEV__) {
         if (arguments.length != 3) {
           JX.$E(
             'JX.Stratcom.listen(...): '+
             'requires exactly 3 arguments. Did you mean JX.DOM.listen?');
         }
         if (typeof func != 'function') {
           JX.$E(
             'JX.Stratcom.listen(...): '+
             'callback is not a function.');
         }
       }
 
       var ids = [];
 
       types = JX.$AX(types);
 
       if (!paths) {
         paths = this._auto;
       }
       if (!JX.isArray(paths)) {
         paths = [[paths]];
       } else if (!JX.isArray(paths[0])) {
         paths = [paths];
       }
 
       var listener = { _callback : func };
 
       //  To listen to multiple event types on multiple paths, we just install
       //  the same listener a whole bunch of times: if we install for two
       //  event types on three paths, we'll end up with six references to the
       //  listener.
       //
       //  TODO: we'll call your listener twice if you install on two paths where
       //  one path is a subset of another. The solution is "don't do that", but
       //  it would be nice to verify that the caller isn't doing so, in __DEV__.
       for (var ii = 0; ii < types.length; ++ii) {
         var type = types[ii];
         if (('onpagehide' in window) && type == 'unload') {
           // If we use "unload", we break the bfcache ("Back-Forward Cache") in
           // Safari and Firefox. The BFCache makes using the back/forward
           // buttons really fast since the pages can come out of magical
           // fairyland instead of over the network, so use "pagehide" as a proxy
           // for "unload" in these browsers.
           type = 'pagehide';
         }
         if (!(type in this._targets)) {
           this._targets[type] = {};
         }
         var type_target = this._targets[type];
         for (var jj = 0; jj < paths.length; ++jj) {
           var path = paths[jj];
           var id = this._handlers.length;
           this._handlers.push(listener);
           this._need[id] = path.length;
           ids.push(id);
           for (var kk = 0; kk < path.length; ++kk) {
             if (__DEV__) {
               if (path[kk] == 'tag:#document') {
                 JX.$E(
                   'JX.Stratcom.listen(..., "tag:#document", ...): ' +
                   'listen for all events using null, not "tag:#document"');
               }
               if (path[kk] == 'tag:window') {
                 JX.$E(
                   'JX.Stratcom.listen(..., "tag:window", ...): ' +
                   'listen for window events using null, not "tag:window"');
               }
             }
             (type_target[path[kk]] || (type_target[path[kk]] = [])).push(id);
           }
         }
       }
 
       // Add a remove function to the listener
       listener['remove'] = function() {
         if (listener._callback) {
           delete listener._callback;
           for (var ii = 0; ii < ids.length; ii++) {
             delete JX.Stratcom._handlers[ids[ii]];
           }
         }
       };
 
       return listener;
     },
 
 
     /**
      * Sometimes you may be interested in removing a listener directly from it's
      * handler. This is possible by calling JX.Stratcom.removeCurrentListener()
      *
      *   // Listen to only the first click on the page
      *   JX.Stratcom.listen('click', null, function() {
      *     // do interesting things
      *     JX.Stratcom.removeCurrentListener();
      *   });
      *
      * @task remove
      */
     removeCurrentListener : function() {
       var context = this._execContext[this._execContext.length - 1];
       var listeners = context.listeners;
       // JX.Stratcom.pass will have incremented cursor by now
       var cursor = context.cursor - 1;
       if (listeners[cursor]) {
         listeners[cursor].handler.remove();
       }
     },
 
 
     /**
      * Dispatch a native Javascript event through the Stratcom control flow.
      * Generally, this is automatically called for you by the master dispatcher
      * installed by ##init.js##. When you want to dispatch an application event,
      * you should instead call invoke().
      *
      * @param  Event       Native event for dispatch.
      * @return :JX.Event   Dispatched :JX.Event.
      * @task internal
      */
     dispatch : function(event) {
       var path = [];
       var nodes = {};
       var distances = {};
       var push = function(key, node, distance) {
         // we explicitly only store the first occurrence of each key
         if (!nodes.hasOwnProperty(key)) {
           nodes[key] = node;
           distances[key] = distance;
           path.push(key);
         }
       };
 
       var target = event.srcElement || event.target;
 
       // Touch events may originate from text nodes, but we want to start our
       // traversal from the nearest Element, so we grab the parentNode instead.
       if (target && target.nodeType === 3) {
         target = target.parentNode;
       }
 
       // Since you can only listen by tag, id, or sigil we unset the target if
       // it isn't an Element. Document and window are Nodes but not Elements.
       if (!target || !target.getAttribute) {
         target = null;
       }
 
       var distance = 1;
       var cursor = target;
       while (cursor && cursor.getAttribute) {
         push('tag:' + cursor.nodeName.toLowerCase(), cursor, distance);
 
         var id = cursor.id;
         if (id) {
           push('id:' + id, cursor, distance);
         }
 
         var sigils = cursor.getAttribute('data-sigil');
         if (sigils) {
           sigils = sigils.split(' ');
           for (var ii = 0; ii < sigils.length; ii++) {
             push(sigils[ii], cursor, distance);
           }
         }
 
         var auto_id = cursor.getAttribute('data-autoid');
         if (auto_id) {
           push('autoid:' + auto_id, cursor, distance);
         }
 
         ++distance;
         cursor = cursor.parentNode;
       }
 
       var etype = event.type;
       if (etype == 'focusin') {
         etype = 'focus';
       } else if (etype == 'focusout') {
         etype = 'blur';
       }
 
       var proxy = new JX.Event()
         .setRawEvent(event)
         .setData(event.customData)
         .setType(etype)
         .setTarget(target)
         .setNodes(nodes)
         .setNodeDistances(distances)
         .setPath(path.reverse());
 
       // Don't touch this for debugging purposes
       //JX.log('~> '+proxy.toString());
 
       return this._dispatchProxy(proxy);
     },
 
 
     /**
      * Dispatch a previously constructed proxy :JX.Event.
      *
      * @param  :JX.Event Event to dispatch.
      * @return :JX.Event Returns the event argument.
      * @task internal
      */
     _dispatchProxy : function(proxy) {
 
       var scope = this._targets[proxy.getType()];
 
       if (!scope) {
         return proxy;
       }
 
       var path = proxy.getPath();
       var distances = proxy.getNodeDistances();
       var len = path.length;
       var hits = {};
       var hit_distances = {};
       var matches;
 
       // A large number (larger than any distance we will ever encounter), but
       // we need to do math on it in the sort function so we can't use
       // Number.POSITIVE_INFINITY.
       var far_away = 1000000;
 
       for (var root = -1; root < len; ++root) {
         matches = scope[(root == -1) ? this._auto : path[root]];
         if (matches) {
           var distance = distances[path[root]] || far_away;
           for (var ii = 0; ii < matches.length; ++ii) {
             var match = matches[ii];
             hits[match] = (hits[match] || 0) + 1;
             hit_distances[match] = Math.min(
               hit_distances[match] || distance,
               distance
             );
           }
         }
       }
 
       var listeners = [];
 
       for (var k in hits) {
         if (hits[k] == this._need[k]) {
           var handler = this._handlers[k];
           if (handler) {
             listeners.push({
               distance: hit_distances[k],
               handler: handler
             });
           }
         }
       }
 
       // Sort listeners by matched sigil closest to the target node
       // Listeners with the same closest sigil are called in an undefined order
       listeners.sort(function(a, b) {
         if (__DEV__) {
           // Make sure people play by the rules. >:)
           return (a.distance - b.distance) || (Math.random() - 0.5);
         }
         return a.distance - b.distance;
       });
 
       this._execContext.push({
         listeners: listeners,
         event: proxy,
         cursor: 0
       });
 
       this.pass();
 
       this._execContext.pop();
 
       return proxy;
     },
 
 
     /**
      * Pass on an event, allowing other handlers to process it. The use case
      * here is generally something like:
      *
      *   if (JX.Stratcom.pass()) {
      *     // something else handled the event
      *     return;
      *   }
      *   // handle the event
      *   event.prevent();
      *
      * This allows you to install event handlers that operate at a lower
      * effective priority, and provide a default behavior which is overridable
      * by listeners.
      *
      * @return bool  True if the event was stopped or prevented by another
      *               handler.
      * @task handle
      */
     pass : function() {
       var context = this._execContext[this._execContext.length - 1];
       var event = context.event;
       var listeners = context.listeners;
       while (context.cursor < listeners.length) {
         var cursor = context.cursor++;
         if (listeners[cursor]) {
           var handler = listeners[cursor].handler;
           handler._callback && handler._callback(event);
         }
         if (event.getStopped()) {
           break;
         }
       }
       return event.getStopped() || event.getPrevented();
     },
 
 
     /**
      * Retrieve the event (if any) which is currently being dispatched.
      *
      * @return :JX.Event|null   Event which is currently being dispatched, or
      *                          null if there is no active dispatch.
      * @task handle
      */
     context : function() {
       var len = this._execContext.length;
       return len ? this._execContext[len - 1].event : null;
     },
 
 
     /**
      * Merge metadata. You must call this (even if you have no metadata) to
      * start the Stratcom queue.
      *
      * @param  int          The datablock to merge data into.
      * @param  dict         Dictionary of metadata.
      * @return void
      * @task internal
      */
     mergeData : function(block, data) {
       if (this._data[block]) {
         if (__DEV__) {
           for (var key in data) {
             if (key in this._data[block]) {
               JX.$E(
                 'JX.Stratcom.mergeData(' + block + ', ...); is overwriting ' +
                 'existing data.');
             }
           }
         }
         JX.copy(this._data[block], data);
       } else {
         this._data[block] = data;
         if (block === 0) {
           JX.Stratcom.ready = true;
           JX.flushHoldingQueue('install-init', function(fn) {
             fn();
           });
           JX.__rawEventQueue({type: 'start-queue'});
         }
       }
     },
 
 
     /**
      * Determine if a node has a specific sigil.
      *
      * @param  Node    Node to test.
      * @param  string  Sigil to check for.
      * @return bool    True if the node has the sigil.
      *
      * @task sigil
      */
     hasSigil : function(node, sigil) {
       if (__DEV__) {
         if (!node || !node.getAttribute) {
           JX.$E(
             'JX.Stratcom.hasSigil(<non-element>, ...): ' +
             'node is not an element. Most likely, you\'re passing window or ' +
             'document, which are not elements and can\'t have sigils.');
         }
       }
 
       var sigils = node.getAttribute('data-sigil') || false;
       return sigils && (' ' + sigils + ' ').indexOf(' ' + sigil + ' ') > -1;
     },
 
 
     /**
      * Add a sigil to a node.
      *
      * @param   Node    Node to add the sigil to.
      * @param   string  Sigil to name the node with.
      * @return  void
      * @task sigil
      */
     addSigil: function(node, sigil) {
       if (__DEV__) {
         if (!node || !node.getAttribute) {
           JX.$E(
             'JX.Stratcom.addSigil(<non-element>, ...): ' +
             'node is not an element. Most likely, you\'re passing window or ' +
             'document, which are not elements and can\'t have sigils.');
         }
       }
 
       var sigils = node.getAttribute('data-sigil') || '';
       if (!JX.Stratcom.hasSigil(node, sigil)) {
         sigils += ' ' + sigil;
       }
 
       node.setAttribute('data-sigil', sigils);
     },
 
 
     /**
      * Retrieve a node's metadata.
      *
      * @param   Node    Node from which to retrieve data.
      * @return  object  Data attached to the node. If no data has been attached
      *                  to the node yet, an empty object will be returned, but
      *                  subsequent calls to this method will always retrieve the
      *                  same object.
      * @task meta
      */
     getData : function(node) {
       if (__DEV__) {
         if (!node || !node.getAttribute) {
           JX.$E(
             'JX.Stratcom.getData(<non-element>): ' +
             'node is not an element. Most likely, you\'re passing window or ' +
             'document, which are not elements and can\'t have data.');
         }
       }
 
       var meta_id = (node.getAttribute('data-meta') || '').split('_');
       if (meta_id[0] && meta_id[1]) {
         var block = this._data[meta_id[0]];
         var index = meta_id[1];
         if (block && (index in block)) {
           return block[index];
         } else if (__DEV__) {
           JX.$E(
             'JX.Stratcom.getData(<node>): Tried to access data (block ' +
             meta_id[0] + ', index ' + index + ') that was not present. This ' +
             'probably means you are calling getData() before the block ' +
             'is provided by mergeData().');
         }
       }
 
       var data = {};
       if (!this._data[1]) { // data block 1 is reserved for JavaScript
         this._data[1] = {};
       }
       this._data[1][this._dataIndex] = data;
       node.setAttribute('data-meta', '1_' + (this._dataIndex++));
       return data;
     },
 
 
     /**
      * Add data to a node's metadata.
      *
      * @param   Node    Node which data should be attached to.
      * @param   object  Data to add to the node's metadata.
      * @return  object  Data attached to the node that is returned by
      *                  JX.Stratcom.getData().
      * @task meta
      */
     addData : function(node, data) {
       if (__DEV__) {
         if (!node || !node.getAttribute) {
           JX.$E(
             'JX.Stratcom.addData(<non-element>, ...): ' +
             'node is not an element. Most likely, you\'re passing window or ' +
             'document, which are not elements and can\'t have sigils.');
         }
         if (!data || typeof data != 'object') {
           JX.$E(
             'JX.Stratcom.addData(..., <nonobject>): ' +
             'data to attach to node is not an object. You must use ' +
             'objects, not primitives, for metadata.');
         }
       }
 
       return JX.copy(JX.Stratcom.getData(node), data);
     },
 
 
     /**
      * @task internal
      */
     allocateMetadataBlock : function() {
       return this._dataBlock++;
     }
   }
 });
diff --git a/webroot/rsrc/externals/javelin/core/install.js b/webroot/rsrc/externals/javelin/core/install.js
index 9f492569f8..284d529be4 100644
--- a/webroot/rsrc/externals/javelin/core/install.js
+++ b/webroot/rsrc/externals/javelin/core/install.js
@@ -1,459 +1,455 @@
 /**
  * @requires javelin-util
  *           javelin-magical-init
  * @provides javelin-install
  *
  * @javelin-installs JX.install
  * @javelin-installs JX.createClass
  *
  * @javelin
  */
 
 /**
  * Install a class into the Javelin ("JX") namespace. The first argument is the
  * name of the class you want to install, and the second is a map of these
  * attributes (all of which are optional):
  *
  *   - ##construct## //(function)// Class constructor. If you don't provide one,
  *       one will be created for you (but it will be very boring).
  *   - ##extend## //(string)// The name of another JX-namespaced class to extend
  *       via prototypal inheritance.
  *   - ##members## //(map)// A map of instance methods and properties.
  *   - ##statics## //(map)// A map of static methods and properties.
  *   - ##initialize## //(function)// A function which will be run once, after
  *       this class has been installed.
  *   - ##properties## //(map)// A map of properties that should have instance
  *       getters and setters automatically generated for them. The key is the
  *       property name and the value is its default value. For instance, if you
  *       provide the property "size", the installed class will have the methods
  *       "getSize()" and "setSize()". It will **NOT** have a property ".size"
  *       and no guarantees are made about where install is actually chosing to
  *       store the data. The motivation here is to let you cheaply define a
  *       stable interface and refine it later as necessary.
  *   - ##events## //(list)// List of event types this class is capable of
  *       emitting.
  *
  * For example:
  *
  *   JX.install('Dog', {
  *     construct : function(name) {
  *       this.setName(name);
  *     },
  *     members : {
  *       bark : function() {
  *         // ...
  *       }
  *     },
  *     properites : {
  *       name : null,
  *     }
  *   });
  *
  * This creates a new ##Dog## class in the ##JX## namespace:
  *
  *   var d = new JX.Dog();
  *   d.bark();
  *
  * Javelin classes are normal Javascript functions and generally behave in
  * the expected way. Some properties and methods are automatically added to
  * all classes:
  *
  *   - ##instance.__id__## Globally unique identifier attached to each instance.
  *   - ##prototype.__class__## Reference to the class constructor.
  *   - ##constructor.__path__## List of path tokens used emit events. It is
  *       probably never useful to access this directly.
  *   - ##constructor.__readable__## Readable class name. You could use this
  *       for introspection.
  *   - ##constructor.__events__## //DEV ONLY!// List of events supported by
  *       this class.
  *   - ##constructor.listen()## Listen to all instances of this class. See
  *       @{JX.Base}.
  *   - ##instance.listen()## Listen to one instance of this class. See
  *       @{JX.Base}.
  *   - ##instance.invoke()## Invoke an event from an instance. See @{JX.Base}.
  *
  *
  * @param  string  Name of the class to install. It will appear in the JX
  *                 "namespace" (e.g., JX.Pancake).
  * @param  map     Map of properties, see method documentation.
  * @return void
- *
- * @group install
  */
 JX.install = function(new_name, new_junk) {
 
   // If we've already installed this, something is up.
   if (new_name in JX) {
     if (__DEV__) {
       JX.$E(
         'JX.install("' + new_name + '", ...): ' +
         'trying to reinstall something that has already been installed.');
     }
     return;
   }
 
   if (__DEV__) {
     if ('name' in new_junk) {
       JX.$E(
         'JX.install("' + new_name + '", {"name": ...}): ' +
         'trying to install with "name" property.' +
         'Either remove it or call JX.createClass directly.');
     }
   }
 
   // Since we may end up loading things out of order (e.g., Dog extends Animal
   // but we load Dog first) we need to keep a list of things that we've been
   // asked to install but haven't yet been able to install around.
   (JX.install._queue || (JX.install._queue = [])).push([new_name, new_junk]);
   var name;
   do {
     var junk;
     var initialize;
     name = null;
     for (var ii = 0; ii < JX.install._queue.length; ++ii) {
       junk = JX.install._queue[ii][1];
       if (junk.extend && !JX[junk.extend]) {
         // We need to extend something that we haven't been able to install
         // yet, so just keep this in queue.
         continue;
       }
 
       // Install time! First, get this out of the queue.
       name = JX.install._queue.splice(ii, 1)[0][0];
       --ii;
 
       if (junk.extend) {
         junk.extend = JX[junk.extend];
       }
 
       initialize = junk.initialize;
       delete junk.initialize;
       junk.name = 'JX.' + name;
 
       JX[name] = JX.createClass(junk);
 
       if (initialize) {
         if (JX['Stratcom'] && JX['Stratcom'].ready) {
           initialize.apply(null);
         } else {
           // This is a holding queue, defined in init.js.
           JX['install-init'](initialize);
         }
       }
     }
 
     // In effect, this exits the loop as soon as we didn't make any progress
     // installing things, which means we've installed everything we have the
     // dependencies for.
   } while (name);
 };
 
 /**
  * Creates a class from a map of attributes. Requires ##extend## property to
  * be an actual Class object and not a "String". Supports ##name## property
  * to give the created Class a readable name.
  *
  * @see JX.install for description of supported attributes.
  *
  * @param  junk     Map of properties, see method documentation.
  * @return function Constructor of a class created
- *
- * @group install
  */
 JX.createClass = function(junk) {
   var name = junk.name || '';
   var k;
   var ii;
 
   if (__DEV__) {
     var valid = {
       construct : 1,
       statics : 1,
       members : 1,
       extend : 1,
       properties : 1,
       events : 1,
       name : 1
     };
     for (k in junk) {
       if (!(k in valid)) {
         JX.$E(
           'JX.createClass("' + name + '", {"' + k + '": ...}): ' +
           'trying to create unknown property `' + k + '`.');
       }
     }
     if (junk.constructor !== {}.constructor) {
       JX.$E(
         'JX.createClass("' + name + '", {"constructor": ...}): ' +
         'property `constructor` should be called `construct`.');
     }
   }
 
   // First, build the constructor. If construct is just a function, this
   // won't change its behavior (unless you have provided a really awesome
   // function, in which case it will correctly punish you for your attempt
   // at creativity).
   var Class = (function(name, junk) {
     var result = function() {
       this.__id__ = '__obj__' + (++JX.install._nextObjectID);
       return (junk.construct || junk.extend || JX.bag).apply(this, arguments);
       // TODO: Allow mixins to initialize here?
       // TODO: Also, build mixins?
     };
 
     if (__DEV__) {
       var inner = result;
       result = function() {
         if (this == window || this == JX) {
           JX.$E(
             '<' + Class.__readable__ + '>: ' +
             'Tried to construct an instance without the "new" operator.');
         }
         return inner.apply(this, arguments);
       };
     }
     return result;
   })(name, junk);
 
   Class.__readable__ = name;
 
   // Copy in all the static methods and properties.
   for (k in junk.statics) {
     // Can't use JX.copy() here yet since it may not have loaded.
     Class[k] = junk.statics[k];
   }
 
   var proto;
   if (junk.extend) {
     var Inheritance = function() {};
     Inheritance.prototype = junk.extend.prototype;
     proto = Class.prototype = new Inheritance();
   } else {
     proto = Class.prototype = {};
   }
 
   proto.__class__ = Class;
   var setter = function(prop) {
     return function(v) {
       this[prop] = v;
       return this;
     };
   };
   var getter = function(prop) {
     return function(v) {
       return this[prop];
     };
   };
 
   // Build getters and setters from the `prop' map.
   for (k in (junk.properties || {})) {
     var base = k.charAt(0).toUpperCase() + k.substr(1);
     var prop = '__auto__' + k;
     proto[prop] = junk.properties[k];
     proto['set' + base] = setter(prop);
     proto['get' + base] = getter(prop);
   }
 
   if (__DEV__) {
 
     // Check for aliasing in default values of members. If we don't do this,
     // you can run into a problem like this:
     //
     //  JX.install('List', { members : { stuff : [] }});
     //
     //  var i_love = new JX.List();
     //  var i_hate = new JX.List();
     //
     //  i_love.stuff.push('Psyduck');  // I love psyduck!
     //  JX.log(i_hate.stuff);          // Show stuff I hate.
     //
     // This logs ["Psyduck"] because the push operation modifies
     // JX.List.prototype.stuff, which is what both i_love.stuff and
     // i_hate.stuff resolve to. To avoid this, set the default value to
     // null (or any other scalar) and do "this.stuff = [];" in the
     // constructor.
 
     for (var member_name in junk.members) {
       if (junk.extend && member_name[0] == '_') {
         JX.$E(
           'JX.createClass("' + name + '", ...): ' +
           'installed member "' + member_name + '" must not be named with ' +
           'a leading underscore because it is in a subclass. Variables ' +
           'are analyzed and crushed one file at a time, and crushed ' +
           'member variables in subclasses alias crushed member variables ' +
           'in superclasses. Remove the underscore, refactor the class so ' +
           'it does not extend anything, or fix the minifier to be ' +
           'capable of safely crushing subclasses.');
       }
       var member_value = junk.members[member_name];
       if (typeof member_value == 'object' && member_value !== null) {
         JX.$E(
           'JX.createClass("' + name + '", ...): ' +
           'installed member "' + member_name + '" is not a scalar or ' +
           'function. Prototypal inheritance in Javascript aliases object ' +
           'references across instances so all instances are initialized ' +
           'to point at the exact same object. This is almost certainly ' +
           'not what you intended. Make this member static to share it ' +
           'across instances, or initialize it in the constructor to ' +
           'prevent reference aliasing and give each instance its own ' +
           'copy of the value.');
       }
     }
   }
 
 
   // This execution order intentionally allows you to override methods
   // generated from the "properties" initializer.
   for (k in junk.members) {
     proto[k] = junk.members[k];
   }
 
   // IE does not enumerate some properties on objects
   var enumerables = JX.install._enumerables;
   if (junk.members && enumerables) {
     ii = enumerables.length;
     while (ii--){
       var property = enumerables[ii];
       if (junk.members[property]) {
         proto[property] = junk.members[property];
       }
     }
   }
 
   // Build this ridiculous event model thing. Basically, this defines
   // two instance methods, invoke() and listen(), and one static method,
   // listen(). If you listen to an instance you get events for that
   // instance; if you listen to a class you get events for all instances
   // of that class (including instances of classes which extend it).
   //
   // This is rigged up through Stratcom. Each class has a path component
   // like "class:Dog", and each object has a path component like
   // "obj:23". When you invoke on an object, it emits an event with
   // a path that includes its class, all parent classes, and its object
   // ID.
   //
   // Calling listen() on an instance listens for just the object ID.
   // Calling listen() on a class listens for that class's name. This
   // has the effect of working properly, but installing them is pretty
   // messy.
 
   var parent = junk.extend || {};
   var old_events = parent.__events__;
   var new_events = junk.events || [];
   var has_events = old_events || new_events.length;
 
   if (has_events) {
     var valid_events = {};
 
     // If we're in dev, we build up a list of valid events (for this class
     // and our parent class), and then check them on listen and invoke.
     if (__DEV__) {
       for (var key in old_events || {}) {
         valid_events[key] = true;
       }
       for (ii = 0; ii < new_events.length; ++ii) {
         valid_events[junk.events[ii]] = true;
       }
     }
 
     Class.__events__ = valid_events;
 
     // Build the class name chain.
     Class.__name__ = 'class:' + name;
     var ancestry = parent.__path__ || [];
     Class.__path__ = ancestry.concat([Class.__name__]);
 
     proto.invoke = function(type) {
       if (__DEV__) {
         if (!(type in this.__class__.__events__)) {
           JX.$E(
             this.__class__.__readable__ + '.invoke("' + type + '", ...): ' +
             'invalid event type. Valid event types are: ' +
             JX.keys(this.__class__.__events__).join(', ') + '.');
         }
       }
       // Here and below, this nonstandard access notation is used to mask
       // these callsites from the static analyzer. JX.Stratcom is always
       // available by the time we hit these execution points.
       return JX['Stratcom'].invoke(
         'obj:' + type,
         this.__class__.__path__.concat([this.__id__]),
         {args : JX.$A(arguments).slice(1)});
     };
 
     proto.listen = function(type, callback) {
       if (__DEV__) {
         if (!(type in this.__class__.__events__)) {
           JX.$E(
             this.__class__.__readable__ + '.listen("' + type + '", ...): ' +
             'invalid event type. Valid event types are: ' +
             JX.keys(this.__class__.__events__).join(', ') + '.');
         }
       }
       return JX['Stratcom'].listen(
         'obj:' + type,
         this.__id__,
         JX.bind(this, function(e) {
           return callback.apply(this, e.getData().args);
         }));
     };
 
     Class.listen = function(type, callback) {
       if (__DEV__) {
         if (!(type in this.__events__)) {
           JX.$E(
             this.__readable__ + '.listen("' + type + '", ...): ' +
             'invalid event type. Valid event types are: ' +
             JX.keys(this.__events__).join(', ') + '.');
         }
       }
       return JX['Stratcom'].listen(
         'obj:' + type,
         this.__name__,
         JX.bind(this, function(e) {
           return callback.apply(this, e.getData().args);
         }));
     };
   } else if (__DEV__) {
     var error_message =
       'class does not define any events. Pass an "events" property to ' +
       'JX.createClass() to define events.';
     Class.listen = Class.listen || function() {
       JX.$E(
         this.__readable__ + '.listen(...): ' +
         error_message);
     };
     Class.invoke = Class.invoke || function() {
       JX.$E(
         this.__readable__ + '.invoke(...): ' +
         error_message);
     };
     proto.listen = proto.listen || function() {
       JX.$E(
         this.__class__.__readable__ + '.listen(...): ' +
         error_message);
     };
     proto.invoke = proto.invoke || function() {
       JX.$E(
         this.__class__.__readable__ + '.invoke(...): ' +
         error_message);
     };
   }
 
   return Class;
 };
 
 JX.install._nextObjectID = 0;
 JX.flushHoldingQueue('install', JX.install);
 
 (function() {
   // IE does not enter this loop.
   for (var i in {toString: 1}) {
     return;
   }
 
   JX.install._enumerables = [
     'toString', 'hasOwnProperty', 'valueOf', 'isPrototypeOf',
     'propertyIsEnumerable', 'toLocaleString', 'constructor'
   ];
 })();
diff --git a/webroot/rsrc/externals/javelin/core/util.js b/webroot/rsrc/externals/javelin/core/util.js
index efd4b7c39a..0d0d8f0b3e 100644
--- a/webroot/rsrc/externals/javelin/core/util.js
+++ b/webroot/rsrc/externals/javelin/core/util.js
@@ -1,366 +1,346 @@
 /**
  * Javelin utility functions.
  *
  * @provides javelin-util
  *
  * @javelin-installs JX.$E
  * @javelin-installs JX.$A
  * @javelin-installs JX.$AX
  * @javelin-installs JX.isArray
  * @javelin-installs JX.copy
  * @javelin-installs JX.bind
  * @javelin-installs JX.bag
  * @javelin-installs JX.keys
  * @javelin-installs JX.log
  * @javelin-installs JX.id
  * @javelin-installs JX.now
  *
  * @javelin
  */
 
 /**
  * Throw an exception and attach the caller data in the exception.
  *
  * @param  string  Exception message.
- *
- * @group util
  */
 JX.$E = function(message) {
   var e = new Error(message);
   var caller_fn = JX.$E.caller;
   if (caller_fn) {
     e.caller_fn = caller_fn.caller;
   }
   throw e;
 };
 
 
 /**
  * Convert an array-like object (usually ##arguments##) into a real Array. An
  * "array-like object" is something with a ##length## property and numerical
  * keys. The most common use for this is to let you call Array functions on the
  * magical ##arguments## object.
  *
  *   JX.$A(arguments).slice(1);
  *
  * @param  obj     Array, or array-like object.
  * @return Array   Actual array.
- *
- * @group util
  */
 JX.$A = function(object) {
   // IE8 throws "JScript object expected" when trying to call
   // Array.prototype.slice on a NodeList, so just copy items one by one here.
   var r = [];
   for (var ii = 0; ii < object.length; ii++) {
     r.push(object[ii]);
   }
   return r;
 };
 
 
 /**
  * Cast a value into an array, by wrapping scalars into singletons. If the
  * argument is an array, it is returned unmodified. If it is a scalar, an array
  * with a single element is returned. For example:
  *
  *   JX.$AX([3]); // Returns [3].
  *   JX.$AX(3);   // Returns [3].
  *
  * Note that this function uses a @{function:JX.isArray} check whether or not
  * the argument is an array, so you may need to convert array-like objects (such
  * as ##arguments##) into real arrays with @{function:JX.$A}.
  *
  * This function is mostly useful to create methods which accept either a
  * value or a list of values.
  *
  * @param  wild    Scalar or Array.
  * @return Array   If the argument was a scalar, an Array with the argument as
  *                 its only element. Otherwise, the original Array.
- *
- * @group util
  */
 JX.$AX = function(maybe_scalar) {
   return JX.isArray(maybe_scalar) ? maybe_scalar : [maybe_scalar];
 };
 
 
 /**
  * Checks whether a value is an array.
  *
  *   JX.isArray(['an', 'array']); // Returns true.
  *   JX.isArray('Not an Array');  // Returns false.
  *
  * @param  wild     Any value.
  * @return bool     true if the argument is an array, false otherwise.
- *
- * @group util
  */
 JX.isArray = Array.isArray || function(maybe_array) {
   return Object.prototype.toString.call(maybe_array) == '[object Array]';
 };
 
 
 /**
  * Copy properties from one object to another. If properties already exist, they
  * are overwritten.
  *
  *   var cat  = {
  *     ears: 'clean',
  *     paws: 'clean',
  *     nose: 'DIRTY OH NOES'
  *   };
  *   var more = {
  *     nose: 'clean',
  *     tail: 'clean'
  *   };
  *
  *   JX.copy(cat, more);
  *
  *   // cat is now:
  *   //  {
  *   //    ears: 'clean',
  *   //    paws: 'clean',
  *   //    nose: 'clean',
  *   //    tail: 'clean'
  *   //  }
  *
  * NOTE: This function does not copy the ##toString## property or anything else
  * which isn't enumerable or is somehow magic or just doesn't work. But it's
  * usually what you want.
  *
  * @param  obj Destination object, which properties should be copied to.
  * @param  obj Source object, which properties should be copied from.
  * @return obj Modified destination object.
- *
- * @group util
  */
 JX.copy = function(copy_dst, copy_src) {
   for (var k in copy_src) {
     copy_dst[k] = copy_src[k];
   }
   return copy_dst;
 };
 
 
 /**
  * Create a function which invokes another function with a bound context and
  * arguments (i.e., partial function application) when called; king of all
  * functions.
  *
  * Bind performs context binding (letting you select what the value of ##this##
  * will be when a function is invoked) and partial function application (letting
  * you create some function which calls another one with bound arguments).
  *
  * = Context Binding =
  *
  * Normally, when you call ##obj.method()##, the magic ##this## object will be
  * the ##obj## you invoked the method from. This can be undesirable when you
  * need to pass a callback to another function. For instance:
  *
  *   COUNTEREXAMPLE
  *   var dog = new JX.Dog();
  *   dog.barkNow(); // Makes the dog bark.
  *
  *   JX.Stratcom.listen('click', 'bark', dog.barkNow); // Does not work!
  *
  * This doesn't work because ##this## is ##window## when the function is
  * later invoked; @{method:JX.Stratcom.listen} does not know about the context
  * object ##dog##. The solution is to pass a function with a bound context
  * object:
  *
  *   var dog = new JX.Dog();
  *   var bound_function = JX.bind(dog, dog.barkNow);
  *
  *   JX.Stratcom.listen('click', 'bark', bound_function);
  *
  * ##bound_function## is a function with ##dog## bound as ##this##; ##this##
  * will always be ##dog## when the function is called, no matter what
  * property chain it is invoked from.
  *
  * You can also pass ##null## as the context argument to implicitly bind
  * ##window##.
  *
  * = Partial Function Application =
  *
  * @{function:JX.bind} also performs partial function application, which allows
  * you to bind one or more arguments to a function. For instance, if we have a
  * simple function which adds two numbers:
  *
  *   function add(a, b) { return a + b; }
  *   add(3, 4); // 7
  *
  * Suppose we want a new function, like this:
  *
  *   function add3(b) { return 3 + b; }
  *   add3(4); // 7
  *
  * Instead of doing this, we can define ##add3()## in terms of ##add()## by
  * binding the value ##3## to the ##a## argument:
  *
  *   var add3_bound = JX.bind(null, add, 3);
  *   add3_bound(4); // 7
  *
  * Zero or more arguments may be bound in this way. This is particularly useful
  * when using closures in a loop:
  *
  *   COUNTEREXAMPLE
  *   for (var ii = 0; ii < button_list.length; ii++) {
  *     button_list[ii].onclick = function() {
  *       JX.log('You clicked button number '+ii+'!'); // Fails!
  *     };
  *   }
  *
  * This doesn't work; all the buttons report the highest number when clicked.
  * This is because the local ##ii## is captured by the closure. Instead, bind
  * the current value of ##ii##:
  *
  *   var func = function(button_num) {
  *     JX.log('You clicked button number '+button_num+'!');
  *   }
  *   for (var ii = 0; ii < button_list.length; ii++) {
  *     button_list[ii].onclick = JX.bind(null, func, ii);
  *   }
  *
  * @param  obj|null  Context object to bind as ##this##.
  * @param  function  Function to bind context and arguments to.
  * @param  ...       Zero or more arguments to bind.
  * @return function  New function which invokes the original function with
  *                   bound context and arguments when called.
- *
- * @group util
  */
 JX.bind = function(context, func, more) {
   if (__DEV__) {
     if (typeof func != 'function') {
       JX.$E(
         'JX.bind(context, <yuck>, ...): '+
         'Attempting to bind something that is not a function.');
     }
   }
 
   var bound = JX.$A(arguments).slice(2);
   if (func.bind) {
     return func.bind.apply(func, [context].concat(bound));
   }
 
   return function() {
     return func.apply(context || window, bound.concat(JX.$A(arguments)));
   };
 };
 
 
 /**
  * "Bag of holding"; function that does nothing. Primarily, it's used as a
  * placeholder when you want something to be callable but don't want it to
  * actually have an effect.
  *
  * @return void
- *
- * @group util
  */
 JX.bag = function() {
   // \o\ \o/ /o/ woo dance party
 };
 
 
 /**
  * Convert an object's keys into a list. For example:
  *
  *   JX.keys({sun: 1, moon: 1, stars: 1}); // Returns: ['sun', 'moon', 'stars']
  *
  * @param  obj    Object to retrieve keys from.
  * @return list   List of keys.
- *
- * @group util
  */
 JX.keys = Object.keys || function(obj) {
   var r = [];
   for (var k in obj) {
     r.push(k);
   }
   return r;
 };
 
 
 /**
  * Identity function; returns the argument unmodified. This is primarily useful
  * as a placeholder for some callback which may transform its argument.
  *
  * @param   wild  Any value.
  * @return  wild  The passed argument.
- *
- * @group util
  */
 JX.id = function(any) {
   return any;
 };
 
 
 JX.log = JX.bag;
 
 if (__DEV__) {
   if (!window.console || !window.console.log) {
     if (window.opera && window.opera.postError) {
       window.console = {log: function(m) { window.opera.postError(m); }};
     } else {
       window.console = {log: function(m) { }};
     }
   }
 
   /**
    * Print a message to the browser debugging console (like Firebug). This
    * method exists only in ##__DEV__##.
    *
    * @param  string Message to print to the browser debugging console.
    * @return void
-   *
-   * @group util
    */
   JX.log = function(message) {
     window.console.log(message);
   };
 
   window.alert = (function(native_alert) {
     var recent_alerts = [];
     var in_alert = false;
     return function(msg) {
       if (in_alert) {
         JX.log(
           'alert(...): '+
           'discarded reentrant alert.');
         return;
       }
       in_alert = true;
       recent_alerts.push(JX.now());
 
       if (recent_alerts.length > 3) {
         recent_alerts.splice(0, recent_alerts.length - 3);
       }
 
       if (recent_alerts.length >= 3 &&
           (recent_alerts[recent_alerts.length - 1] - recent_alerts[0]) < 5000) {
         if (confirm(msg + "\n\nLots of alert()s recently. Kill them?")) {
           window.alert = JX.bag;
         }
       } else {
         //  Note that we can't .apply() the IE6 version of this "function".
         native_alert(msg);
       }
       in_alert = false;
     };
   })(window.alert);
 }
 
 /**
  * Date.now is the fastest timestamp function, but isn't supported by every
  * browser. This gives the fastest version the environment can support.
  * The wrapper function makes the getTime call even slower, but benchmarking
  * shows it to be a marginal perf loss. Considering how small of a perf
  * difference this makes overall, it's not really a big deal. The primary
  * reason for this is to avoid hacky "just think of the byte savings" JS
  * like +new Date() that has an unclear outcome for the unexposed.
  *
  * @return Int A Unix timestamp of the current time on the local machine
  */
 JX.now = (Date.now || function() { return new Date().getTime(); });
diff --git a/webroot/rsrc/externals/javelin/docs/Base.js b/webroot/rsrc/externals/javelin/docs/Base.js
index d2352e9c99..0d32239608 100644
--- a/webroot/rsrc/externals/javelin/docs/Base.js
+++ b/webroot/rsrc/externals/javelin/docs/Base.js
@@ -1,70 +1,69 @@
 /**
  * @requires javelin-install
  * @javelin
  */
 
 /**
  * This is not a real class, but @{function:JX.install} provides several methods
  * which exist on all Javelin classes. This class documents those methods.
  *
  * @task events Builtin Events
- * @group install
  */
 JX.install('Base', {
   members : {
 
     /**
      * Invoke a class event, notifying all listeners. You must declare the
      * events your class invokes when you install it; see @{function:JX.install}
      * for documentation. Any arguments you provide will be passed to listener
      * callbacks.
      *
      * @param   string      Event type, must be declared when class is
      *                      installed.
      * @param   ...         Zero or more arguments.
      *
      * @return  @{JX.Event} Event object which was dispatched.
      * @task events
      */
     invoke : function(type, more) {
       // <docstub only, see JX.install()> //
     },
 
     /**
      * Listen for events emitted by this object instance. You can also use
      * the static flavor of this method to listen to events emitted by any
      * instance of this object.
      *
      * See also @{method:JX.Stratcom.listen}.
      *
      * @param  string   Type of event to listen for.
      * @param  function Function to call when this event occurs.
      * @return object   A reference to the installed listener. You can later
      *                  remove the listener by calling this object's remove()
      *                  method.
      * @task events
      */
     listen : function(type, callback) {
       // <docstub only, see JX.install()> //
     }
 
   },
   statics : {
 
     /**
      * Static listen interface for listening to events produced by any instance
      * of this class. See @{method:listen} for documentation.
      *
      * @param  string   Type of event to listen for.
      * @param  function Function to call when this event occurs.
      * @return object   A reference to the installed listener. You can later
      *                  remove the listener by calling this object's remove()
      *                  method.
      * @task events
      */
     listen : function(type, callback) {
       // <docstub only, see JX.install()> //
     }
 
   }
 });
diff --git a/webroot/rsrc/externals/javelin/docs/onload.js b/webroot/rsrc/externals/javelin/docs/onload.js
index 7c76c08598..61865b94de 100644
--- a/webroot/rsrc/externals/javelin/docs/onload.js
+++ b/webroot/rsrc/externals/javelin/docs/onload.js
@@ -1,21 +1,20 @@
 /**
  * @javelin
  */
 
 /**
  * Register a callback for invocation after DOMContentReady.
  *
  * NOTE: Although it isn't private, use of this function is heavily discouraged.
  * See @{article:Concepts: Behaviors} for information on using behaviors to
  * structure and invoke glue code.
  *
  * This function is defined as a side effect of init.js.
  *
  * @param function Callback function to invoke after DOMContentReady.
  * @return void
- * @group util
  */
 JX.onload = function(callback) {
   // This isn't the real function definition, it's only defined here to let the
   // documentation generator find it. The actual definition is in init.js.
 };
diff --git a/webroot/rsrc/externals/javelin/lib/DOM.js b/webroot/rsrc/externals/javelin/lib/DOM.js
index dea3d880f6..60ac09603f 100644
--- a/webroot/rsrc/externals/javelin/lib/DOM.js
+++ b/webroot/rsrc/externals/javelin/lib/DOM.js
@@ -1,965 +1,955 @@
 /**
  * @requires javelin-magical-init
  *           javelin-install
  *           javelin-util
  *           javelin-vector
  *           javelin-stratcom
  * @provides javelin-dom
  *
  * @javelin-installs JX.$
  * @javelin-installs JX.$N
  * @javelin-installs JX.$H
  *
  * @javelin
  */
 
 
 /**
  * Select an element by its "id" attribute, like ##document.getElementById()##.
  * For example:
  *
  *   var node = JX.$('some_id');
  *
  * This will select the node with the specified "id" attribute:
  *
  *   LANG=HTML
  *   <div id="some_id">...</div>
  *
  * If the specified node does not exist, @{JX.$()} will throw an exception.
  *
  * For other ways to select nodes from the document, see @{JX.DOM.scry()} and
  * @{JX.DOM.find()}.
  *
  * @param  string  "id" attribute to select from the document.
  * @return Node    Node with the specified "id" attribute.
- *
- * @group dom
  */
 JX.$ = function(id) {
 
   if (__DEV__) {
     if (!id) {
       JX.$E('Empty ID passed to JX.$()!');
     }
   }
 
   var node = document.getElementById(id);
   if (!node || (node.id != id)) {
     if (__DEV__) {
       if (node && (node.id != id)) {
         JX.$E(
           'JX.$("'+id+'"): '+
           'document.getElementById() returned an element without the '+
           'correct ID. This usually means that the element you are trying '+
           'to select is being masked by a form with the same value in its '+
           '"name" attribute.');
       }
     }
     JX.$E("JX.$('" + id + "') call matched no nodes.");
   }
 
   return node;
 };
 
 /**
  * Upcast a string into an HTML object so it is treated as markup instead of
  * plain text. See @{JX.$N} for discussion of Javelin's security model. Every
  * time you call this function you potentially open up a security hole. Avoid
  * its use wherever possible.
  *
  * This class intentionally supports only a subset of HTML because many browsers
  * named "Internet Explorer" have awkward restrictions around what they'll
  * accept for conversion to document fragments. Alter your datasource to emit
  * valid HTML within this subset if you run into an unsupported edge case. All
  * the edge cases are crazy and you should always be reasonably able to emit
  * a cohesive tag instead of an unappendable fragment.
  *
  * You may use @{JX.$H} as a shortcut for creating new JX.HTML instances:
  *
  *   JX.$N('div', {}, some_html_blob); // Treat as string (safe)
  *   JX.$N('div', {}, JX.$H(some_html_blob)); // Treat as HTML (unsafe!)
  *
  * @task build String into HTML
  * @task nodes HTML into Nodes
- *
- * @group dom
  */
 JX.install('HTML', {
 
   construct : function(str) {
     if (str instanceof JX.HTML) {
       this._content = str._content;
       return;
     }
 
     if (__DEV__) {
       if ((typeof str !== 'string') && (!str || !str.match)) {
         JX.$E(
           'new JX.HTML(<empty?>): ' +
           'call initializes an HTML object with an empty value.');
       }
 
       var tags = ['legend', 'thead', 'tbody', 'tfoot', 'column', 'colgroup',
                   'caption', 'tr', 'th', 'td', 'option'];
       var evil_stuff = new RegExp('^\\s*<(' + tags.join('|') + ')\\b', 'i');
       var match = str.match(evil_stuff);
       if (match) {
         JX.$E(
           'new JX.HTML("<' + match[1] + '>..."): ' +
           'call initializes an HTML object with an invalid partial fragment ' +
           'and can not be converted into DOM nodes. The enclosing tag of an ' +
           'HTML content string must be appendable to a document fragment. ' +
           'For example, <table> is allowed but <tr> or <tfoot> are not.');
       }
 
       var really_evil = /<script\b/;
       if (str.match(really_evil)) {
         JX.$E(
           'new JX.HTML("...<script>..."): ' +
           'call initializes an HTML object with an embedded script tag! ' +
           'Are you crazy?! Do NOT do this!!!');
       }
 
       var wont_work = /<object\b/;
       if (str.match(wont_work)) {
         JX.$E(
           'new JX.HTML("...<object>..."): ' +
           'call initializes an HTML object with an embedded <object> tag. IE ' +
           'will not do the right thing with this.');
       }
 
       // TODO(epriestley): May need to deny <option> more broadly, see
       // http://support.microsoft.com/kb/829907 and the whole mess in the
       // heavy stack. But I seem to have gotten away without cloning into the
       // documentFragment below, so this may be a nonissue.
     }
 
     this._content = str;
   },
 
   members : {
     _content : null,
     /**
      * Convert the raw HTML string into a DOM node tree.
      *
      * @task  nodes
      * @return DocumentFragment A document fragment which contains the nodes
      *                          corresponding to the HTML string you provided.
      */
     getFragment : function() {
       var wrapper = JX.$N('div');
       wrapper.innerHTML = this._content;
       var fragment = document.createDocumentFragment();
       while (wrapper.firstChild) {
         // TODO(epriestley): Do we need to do a bunch of cloning junk here?
         // See heavy stack. I'm disconnecting the nodes instead; this seems
         // to work but maybe my test case just isn't extensive enough.
         fragment.appendChild(wrapper.removeChild(wrapper.firstChild));
       }
       return fragment;
     },
 
     /**
      * Convert the raw HTML string into a single DOM node. This only works
      * if the element has a single top-level element. Otherwise, use
      * @{method:getFragment} to get a document fragment instead.
      *
      * @return Node Single node represented by the object.
      * @task nodes
      */
     getNode : function() {
       var fragment = this.getFragment();
       if (__DEV__) {
         if (fragment.childNodes.length < 1) {
           JX.$E('JX.HTML.getNode(): Markup has no root node!');
         }
         if (fragment.childNodes.length > 1) {
           JX.$E('JX.HTML.getNode(): Markup has more than one root node!');
         }
       }
       return fragment.firstChild;
     }
 
   }
 });
 
 
 /**
  * Build a new HTML object from a trustworthy string. JX.$H is a shortcut for
  * creating new JX.HTML instances.
  *
  * @task build
  * @param string A string which you want to be treated as HTML, because you
  *               know it is from a trusted source and any data in it has been
  *               properly escaped.
  * @return JX.HTML HTML object, suitable for use with @{JX.$N}.
- *
- * @group dom
  */
 JX.$H = function(str) {
   return new JX.HTML(str);
 };
 
 
 /**
  * Create a new DOM node with attributes and content.
  *
  *   var link = JX.$N('a');
  *
  * This creates a new, empty anchor tag without any attributes. The equivalent
  * markup would be:
  *
  *   LANG=HTML
  *   <a />
  *
  * You can also specify attributes by passing a dictionary:
  *
  *   JX.$N('a', {name: 'anchor'});
  *
  * This is equivalent to:
  *
  *   LANG=HTML
  *   <a name="anchor" />
  *
  * Additionally, you can specify content:
  *
  *   JX.$N(
  *     'a',
  *     {href: 'http://www.javelinjs.com'},
  *     'Visit the Javelin Homepage');
  *
  * This is equivalent to:
  *
  *   LANG=HTML
  *   <a href="http://www.javelinjs.com">Visit the Javelin Homepage</a>
  *
  * If you only want to specify content, you can omit the attribute parameter.
  * That is, these calls are equivalent:
  *
  *   JX.$N('div', {}, 'Lorem ipsum...'); // No attributes.
  *   JX.$N('div', 'Lorem ipsum...')      // Same as above.
  *
  * Both are equivalent to:
  *
  *   LANG=HTML
  *   <div>Lorem ipsum...</div>
  *
  * Note that the content is treated as plain text, not HTML. This means it is
  * safe to use untrusted strings:
  *
  *   JX.$N('div', '<script src="evil.com" />');
  *
  * This is equivalent to:
  *
  *   LANG=HTML
  *   <div>&lt;script src="evil.com" /&gt;</div>
  *
  * That is, the content will be properly escaped and will not create a
  * vulnerability. If you want to set HTML content, you can use @{JX.HTML}:
  *
  *   JX.$N('div', JX.$H(some_html));
  *
  * **This is potentially unsafe**, so make sure you understand what you're
  * doing. You should usually avoid passing HTML around in string form. See
  * @{JX.HTML} for discussion.
  *
  * You can create new nodes with a Javelin sigil (and, optionally, metadata) by
  * providing "sigil" and "meta" keys in the attribute dictionary.
  *
  * @param string                  Tag name, like 'a' or 'div'.
  * @param dict|string|@{JX.HTML}? Property dictionary, or content if you don't
  *                                want to specify any properties.
  * @param string|@{JX.HTML}?      Content string (interpreted as plain text)
  *                                or @{JX.HTML} object (interpreted as HTML,
  *                                which may be dangerous).
  * @return Node                   New node with whatever attributes and
  *                                content were specified.
- *
- * @group dom
  */
 JX.$N = function(tag, attr, content) {
   if (typeof content == 'undefined' &&
       (typeof attr != 'object' || attr instanceof JX.HTML)) {
     content = attr;
     attr = {};
   }
 
   if (__DEV__) {
     if (tag.toLowerCase() != tag) {
       JX.$E(
         '$N("'+tag+'", ...): '+
         'tag name must be in lower case; '+
         'use "'+tag.toLowerCase()+'", not "'+tag+'".');
     }
   }
 
   var node = document.createElement(tag);
 
   if (attr.style) {
     JX.copy(node.style, attr.style);
     delete attr.style;
   }
 
   if (attr.sigil) {
     JX.Stratcom.addSigil(node, attr.sigil);
     delete attr.sigil;
   }
 
   if (attr.meta) {
     JX.Stratcom.addData(node, attr.meta);
     delete attr.meta;
   }
 
   if (__DEV__) {
     if (('metadata' in attr) || ('data' in attr)) {
       JX.$E(
         '$N(' + tag + ', ...): ' +
         'use the key "meta" to specify metadata, not "data" or "metadata".');
     }
   }
 
   JX.copy(node, attr);
   if (content) {
     JX.DOM.setContent(node, content);
   }
   return node;
 };
 
 
 /**
  * Query and update the DOM. Everything here is static, this is essentially
  * a collection of common utility functions.
  *
  * @task stratcom Attaching Event Listeners
  * @task content Changing DOM Content
  * @task nodes Updating Nodes
  * @task serialize Serializing Forms
  * @task test Testing DOM Properties
  * @task convenience Convenience Methods
  * @task query Finding Nodes in the DOM
  * @task view Changing View State
- *
- * @group dom
  */
 JX.install('DOM', {
   statics : {
     _autoid : 0,
     _uniqid : 0,
     _metrics : {},
 
 
 /* -(  Changing DOM Content  )----------------------------------------------- */
 
 
     /**
      * Set the content of some node. This uses the same content semantics as
      * other Javelin content methods, see @{function:JX.$N} for a detailed
      * explanation. Previous content will be replaced: you can also
      * @{method:prependContent} or @{method:appendContent}.
      *
      * @param Node  Node to set content of.
      * @param mixed Content to set.
      * @return void
      * @task content
      */
     setContent : function(node, content) {
       if (__DEV__) {
         if (!JX.DOM.isNode(node)) {
           JX.$E(
             'JX.DOM.setContent(<yuck>, ...): '+
             'first argument must be a DOM node.');
         }
       }
 
       while (node.firstChild) {
         JX.DOM.remove(node.firstChild);
       }
       JX.DOM.appendContent(node, content);
     },
 
 
     /**
      * Prepend content to some node. This method uses the same content semantics
      * as other Javelin methods, see @{function:JX.$N} for an explanation. You
      * can also @{method:setContent} or @{method:appendContent}.
      *
      * @param Node  Node to prepend content to.
      * @param mixed Content to prepend.
      * @return void
      * @task content
      */
     prependContent : function(node, content) {
       if (__DEV__) {
         if (!JX.DOM.isNode(node)) {
           JX.$E(
             'JX.DOM.prependContent(<junk>, ...): '+
             'first argument must be a DOM node.');
         }
       }
 
       this._insertContent(node, content, this._mechanismPrepend, true);
     },
 
 
     /**
      * Append content to some node. This method uses the same content semantics
      * as other Javelin methods, see @{function:JX.$N} for an explanation. You
      * can also @{method:setContent} or @{method:prependContent}.
      *
      * @param Node Node to append the content of.
      * @param mixed Content to append.
      * @return void
      * @task content
      */
     appendContent : function(node, content) {
       if (__DEV__) {
         if (!JX.DOM.isNode(node)) {
           JX.$E(
             'JX.DOM.appendContent(<bleh>, ...): '+
             'first argument must be a DOM node.');
         }
       }
 
       this._insertContent(node, content, this._mechanismAppend);
     },
 
 
     /**
      * Internal, add content to a node by prepending.
      *
      * @param Node  Node to prepend content to.
      * @param Node  Node to prepend.
      * @return void
      * @task content
      */
     _mechanismPrepend : function(node, content) {
       node.insertBefore(content, node.firstChild);
     },
 
 
     /**
      * Internal, add content to a node by appending.
      *
      * @param Node  Node to append content to.
      * @param Node  Node to append.
      * @task content
      */
     _mechanismAppend : function(node, content) {
       node.appendChild(content);
     },
 
 
     /**
      * Internal, add content to a node using some specified mechanism.
      *
      * @param Node      Node to add content to.
      * @param mixed     Content to add.
      * @param function  Callback for actually adding the nodes.
      * @param bool      True if array elements should be passed to the mechanism
      *                  in reverse order, i.e. the mechanism prepends nodes.
      * @return void
      * @task content
      */
     _insertContent : function(parent, content, mechanism, reverse) {
       if (JX.isArray(content)) {
         if (reverse) {
           content = [].concat(content).reverse();
         }
         for (var ii = 0; ii < content.length; ii++) {
           JX.DOM._insertContent(parent, content[ii], mechanism, reverse);
         }
       } else {
         var type = typeof content;
         if (content instanceof JX.HTML) {
           content = content.getFragment();
         } else if (type == 'string' || type == 'number') {
           content = document.createTextNode(content);
         }
 
         if (__DEV__) {
           if (content && !content.nodeType) {
             JX.$E(
               'JX.DOM._insertContent(<node>, ...): '+
               'second argument must be a string, a number, ' +
               'a DOM node or a JX.HTML instance');
           }
         }
 
         content && mechanism(parent, content);
       }
     },
 
 
 /* -(  Updating Nodes  )----------------------------------------------------- */
 
 
     /**
      * Remove a node from its parent, so it is no longer a child of any other
      * node.
      *
      * @param Node Node to remove.
      * @return Node The node.
      * @task nodes
      */
     remove : function(node) {
       node.parentNode && JX.DOM.replace(node, null);
       return node;
     },
 
 
     /**
      * Replace a node with some other piece of content. This method obeys
      * Javelin content semantics, see @{function:JX.$N} for an explanation.
      * You can also @{method:setContent}, @{method:prependContent}, or
      * @{method:appendContent}.
      *
      * @param Node Node to replace.
      * @param mixed Content to replace it with.
      * @return Node the original node.
      * @task nodes
      */
     replace : function(node, replacement) {
       if (__DEV__) {
         if (!node.parentNode) {
           JX.$E(
             'JX.DOM.replace(<node>, ...): '+
             'node has no parent node, so it can not be replaced.');
         }
       }
 
       var mechanism;
       if (node.nextSibling) {
         mechanism = JX.bind(node.nextSibling, function(parent, content) {
           parent.insertBefore(content, this);
         });
       } else {
         mechanism = this._mechanismAppend;
       }
       var parent = node.parentNode;
       parent.removeChild(node);
       this._insertContent(parent, replacement, mechanism);
 
       return node;
     },
 
 
 /* -(  Serializing Forms  )-------------------------------------------------- */
 
 
     /**
      * Converts a form into a list of <name, value> pairs.
      *
      * Note: This function explicity does not match for submit inputs as there
      * could be multiple in a form. It's the caller's obligation to add the
      * submit input value if desired.
      *
      * @param   Node  The form element to convert into a list of pairs.
      * @return  List  A list of <name, value> pairs.
      * @task serialize
      */
     convertFormToListOfPairs : function(form) {
       var elements = form.getElementsByTagName('*');
       var data = [];
       for (var ii = 0; ii < elements.length; ++ii) {
         if (!elements[ii].name) {
           continue;
         }
         if (elements[ii].disabled) {
           continue;
         }
         var type = elements[ii].type;
         var tag  = elements[ii].tagName;
         if ((type in {radio: 1, checkbox: 1} && elements[ii].checked) ||
              type in {text: 1, hidden: 1, password: 1, email: 1, tel: 1,
                       number: 1} ||
              tag in {TEXTAREA: 1, SELECT: 1}) {
           data.push([elements[ii].name, elements[ii].value]);
         }
       }
       return data;
     },
 
 
     /**
      * Converts a form into a dictionary mapping input names to values. This
      * will overwrite duplicate inputs in an undefined way.
      *
      * @param   Node  The form element to convert into a dictionary.
      * @return  Dict  A dictionary of form values.
      * @task serialize
      */
     convertFormToDictionary : function(form) {
       var data = {};
       var pairs = JX.DOM.convertFormToListOfPairs(form);
       for (var ii = 0; ii < pairs.length; ii++) {
         data[pairs[ii][0]] = pairs[ii][1];
       }
       return data;
     },
 
 
 /* -(  Testing DOM Properties  )--------------------------------------------- */
 
 
     /**
      * Test if an object is a valid Node.
      *
      * @param wild Something which might be a Node.
      * @return bool True if the parameter is a DOM node.
      * @task test
      */
     isNode : function(node) {
       return !!(node && node.nodeName && (node !== window));
     },
 
 
     /**
      * Test if an object is a node of some specific (or one of several) types.
      * For example, this tests if the node is an ##<input />##, ##<select />##,
      * or ##<textarea />##.
      *
      *   JX.DOM.isType(node, ['input', 'select', 'textarea']);
      *
      * @param   wild        Something which might be a Node.
      * @param   string|list One or more tags which you want to test for.
      * @return  bool        True if the object is a node, and it's a node of one
      *                      of the provided types.
      * @task    test
      */
     isType : function(node, of_type) {
       node = ('' + (node.nodeName || '')).toUpperCase();
       of_type = JX.$AX(of_type);
       for (var ii = 0; ii < of_type.length; ++ii) {
         if (of_type[ii].toUpperCase() == node) {
           return true;
         }
       }
       return false;
     },
 
 
     /**
      * Listen for events occuring beneath a specific node in the DOM. This is
      * similar to @{JX.Stratcom.listen()}, but allows you to specify some node
      * which serves as a scope instead of the default scope (the whole document)
      * which you get if you install using @{JX.Stratcom.listen()} directly. For
      * example, to listen for clicks on nodes with the sigil 'menu-item' below
      * the root menu node:
      *
      *   var the_menu = getReferenceToTheMenuNodeSomehow();
      *   JX.DOM.listen(the_menu, 'click', 'menu-item', function(e) { ... });
      *
      * @task stratcom
      * @param Node        The node to listen for events underneath.
      * @param string|list One or more event types to listen for.
      * @param list?       A path to listen on, or a list of paths.
      * @param function    Callback to invoke when a matching event occurs.
      * @return object     A reference to the installed listener. You can later
      *                    remove the listener by calling this object's remove()
      *                    method.
      */
     listen : function(node, type, path, callback) {
       var auto_id = ['autoid:' + JX.DOM._getAutoID(node)];
       path = JX.$AX(path || []);
       if (!path.length) {
         path = auto_id;
       } else {
         for (var ii = 0; ii < path.length; ii++) {
           path[ii] = auto_id.concat(JX.$AX(path[ii]));
         }
       }
       return JX.Stratcom.listen(type, path, callback);
     },
 
 
     /**
      * Invoke a custom event on a node. This method is a companion to
      * @{method:JX.DOM.listen} and parallels @{method:JX.Stratcom.invoke} in
      * the same way that method parallels @{method:JX.Stratcom.listen}.
      *
      * This method can not be used to invoke native events (like 'click').
      *
      * @param Node      The node to invoke an event on.
      * @param string    Custom event type.
      * @param dict      Event data.
      * @return JX.Event The event object which was dispatched to listeners.
      *                  The main use of this is to test whether any
      *                  listeners prevented the event.
      */
     invoke : function(node, type, data) {
       if (__DEV__) {
         if (type in JX.__allowedEvents) {
           throw new Error(
             'JX.DOM.invoke(..., "' + type + '", ...): ' +
             'you cannot invoke with the same type as a native event.');
         }
       }
       return JX.Stratcom.dispatch({
         target: node,
         type: type,
         customData: data
       });
     },
 
 
     uniqID : function(node) {
       if (!node.getAttribute('id')) {
         node.setAttribute('id', 'uniqid_'+(++JX.DOM._uniqid));
       }
       return node.getAttribute('id');
     },
 
     alterClass : function(node, className, add) {
       if (__DEV__) {
         if (add !== false && add !== true) {
           JX.$E(
             'JX.DOM.alterClass(...): ' +
             'expects the third parameter to be Boolean: ' +
             add + ' was provided');
         }
       }
 
       var has = ((' '+node.className+' ').indexOf(' '+className+' ') > -1);
       if (add && !has) {
         node.className += ' '+className;
       } else if (has && !add) {
         node.className = node.className.replace(
           new RegExp('(^|\\s)' + className + '(?:\\s|$)', 'g'), ' ');
       }
     },
 
     htmlize : function(str) {
       return (''+str)
         .replace(/&/g, '&amp;')
         .replace(/"/g, '&quot;')
         .replace(/</g, '&lt;')
         .replace(/>/g, '&gt;');
     },
 
 
     /**
      * Show one or more elements, by removing their "display" style. This
      * assumes you have hidden them with @{method:hide}, or explicitly set
      * the style to `display: none;`.
      *
      * @task convenience
      * @param ... One or more nodes to remove "display" styles from.
      * @return void
      */
     show : function() {
       var ii;
 
       if (__DEV__) {
         for (ii = 0; ii < arguments.length; ++ii) {
           if (!arguments[ii]) {
             JX.$E(
               'JX.DOM.show(...): ' +
               'one or more arguments were null or empty.');
           }
         }
       }
 
       for (ii = 0; ii < arguments.length; ++ii) {
         arguments[ii].style.display = '';
       }
     },
 
 
     /**
      * Hide one or more elements, by setting `display: none;` on them. This is
      * a convenience method. See also @{method:show}.
      *
      * @task convenience
      * @param ... One or more nodes to set "display: none" on.
      * @return void
      */
     hide : function() {
       var ii;
 
       if (__DEV__) {
         for (ii = 0; ii < arguments.length; ++ii) {
           if (!arguments[ii]) {
             JX.$E(
               'JX.DOM.hide(...): ' +
               'one or more arguments were null or empty.');
           }
         }
       }
 
       for (ii = 0; ii < arguments.length; ++ii) {
         arguments[ii].style.display = 'none';
       }
     },
 
     textMetrics : function(node, pseudoclass, x) {
       if (!this._metrics[pseudoclass]) {
         var n = JX.$N(
           'var',
           {className: pseudoclass});
         this._metrics[pseudoclass] = n;
       }
       var proxy = this._metrics[pseudoclass];
       document.body.appendChild(proxy);
       proxy.style.width = x ? (x+'px') : '';
       JX.DOM.setContent(
         proxy,
         JX.$H(JX.DOM.htmlize(node.value).replace(/\n/g, '<br />')));
       var metrics = JX.Vector.getDim(proxy);
       document.body.removeChild(proxy);
       return metrics;
     },
 
 
     /**
      * Search the document for DOM nodes by providing a root node to look
      * beneath, a tag name, and (optionally) a sigil. Nodes which match all
      * specified conditions are returned.
      *
      * @task query
      *
      * @param  Node    Root node to search beneath.
      * @param  string  Tag name, like 'a' or 'textarea'.
      * @param  string  Optionally, a sigil which nodes are required to have.
      *
      * @return list    List of matching nodes, which may be empty.
      */
     scry : function(root, tagname, sigil) {
       if (__DEV__) {
         if (!JX.DOM.isNode(root)) {
           JX.$E(
             'JX.DOM.scry(<yuck>, ...): '+
             'first argument must be a DOM node.');
         }
       }
 
       var nodes = root.getElementsByTagName(tagname);
       if (!sigil) {
         return JX.$A(nodes);
       }
       var result = [];
       for (var ii = 0; ii < nodes.length; ii++) {
         if (JX.Stratcom.hasSigil(nodes[ii], sigil)) {
           result.push(nodes[ii]);
         }
       }
       return result;
     },
 
 
     /**
      * Select a node uniquely identified by a root, tagname and sigil. This
      * is similar to JX.DOM.scry() but expects exactly one result.
      *
      * @task query
      *
      * @param  Node    Root node to search beneath.
      * @param  string  Tag name, like 'a' or 'textarea'.
      * @param  string  Optionally, sigil which selected node must have.
      *
      * @return Node    Node uniquely identified by the criteria.
      */
     find : function(root, tagname, sigil) {
       if (__DEV__) {
         if (!JX.DOM.isNode(root)) {
           JX.$E(
             'JX.DOM.find(<glop>, "'+tagname+'", "'+sigil+'"): '+
             'first argument must be a DOM node.');
         }
       }
 
       var result = JX.DOM.scry(root, tagname, sigil);
 
       if (__DEV__) {
         if (result.length > 1) {
           JX.$E(
             'JX.DOM.find(<node>, "'+tagname+'", "'+sigil+'"): '+
             'matched more than one node.');
         }
       }
 
       if (!result.length) {
         JX.$E(
           'JX.DOM.find(<node>, "' + tagname + '", "' + sigil + '"): ' +
           'matched no nodes.');
       }
 
       return result[0];
     },
 
 
     /**
      * Select a node uniquely identified by an anchor, tagname, and sigil. This
      * is similar to JX.DOM.find() but walks up the DOM tree instead of down
      * it.
      *
      * @param   Node    Node to look above.
      * @param   string  Tag name, like 'a' or 'textarea'.
      * @param   string  Optionally, sigil which selected node must have.
      * @return  Node    Matching node.
      *
      * @task    query
      */
     findAbove : function(anchor, tagname, sigil) {
       if (__DEV__) {
         if (!JX.DOM.isNode(anchor)) {
           JX.$E(
             'JX.DOM.findAbove(<glop>, "' + tagname + '", "' + sigil + '"): ' +
             'first argument must be a DOM node.');
         }
       }
 
       var result = anchor.parentNode;
       while (true) {
         if (!result) {
           break;
         }
         if (JX.DOM.isType(result, tagname)) {
           if (!sigil || JX.Stratcom.hasSigil(result, sigil)) {
             break;
           }
         }
         result = result.parentNode;
       }
 
       if (!result) {
         JX.$E(
           'JX.DOM.findAbove(<node>, "' + tagname + '", "' + sigil + '"): ' +
           'no matching node.');
       }
 
       return result;
     },
 
 
     /**
      * Focus a node safely. This is just a convenience wrapper that allows you
      * to avoid IE's habit of throwing when nearly any focus operation is
      * invoked.
      *
      * @task convenience
      * @param Node Node to move cursor focus to, if possible.
      * @return void
      */
     focus : function(node) {
       try { node.focus(); } catch (lol_ie) {}
     },
 
 
     /**
      * Scroll to the position of an element in the document.
      * @task view
      * @param Node Node to move document scroll position to, if possible.
      * @return void
      */
     scrollTo : function(node) {
       window.scrollTo(0, JX.$V(node).y);
     },
 
     _getAutoID : function(node) {
       if (!node.getAttribute('data-autoid')) {
         node.setAttribute('data-autoid', 'autoid_'+(++JX.DOM._autoid));
       }
       return node.getAttribute('data-autoid');
     }
   }
 });
diff --git a/webroot/rsrc/externals/javelin/lib/JSON.js b/webroot/rsrc/externals/javelin/lib/JSON.js
index e490b19f46..acf86f8507 100644
--- a/webroot/rsrc/externals/javelin/lib/JSON.js
+++ b/webroot/rsrc/externals/javelin/lib/JSON.js
@@ -1,155 +1,154 @@
 /**
  * Simple JSON serializer.
  *
  * @requires javelin-install
  * @provides javelin-json
  * @javelin
  */
 
 /**
  * JSON serializer and parser. This class uses the native JSON parser if it is
  * available; if not, it provides an eval-based parser and a simple serializer.
  *
  * NOTE: This class uses eval() on some systems, without sanitizing input. It is
  * not safe to use with untrusted data. Javelin does not provide a library
  * suitable for parsing untrusted JSON.
  *
  * Usage is straightforward:
  *
  *    JX.JSON.stringify({"bees":"knees"}); // Returns string: '{"bees":"knees"}'
  *    JX.JSON.parse('{"bees":"knees"}');   // Returns object: {"bees":"knees"}
  *
  * @task json      JSON Manipulation
  * @task internal  Internal
- * @group util
  */
 JX.install('JSON', {
   statics : {
 
 
 /* -(  JSON Manipulation  )-------------------------------------------------- */
 
 
     /**
      * Parse a **trusted** JSON string into an object. Accepts a valid JSON
      * string and returns the object it encodes.
      *
      * NOTE: This method does not sanitize input and uses an eval-based parser
      * on some systems. It is **NOT SAFE** to use with untrusted inputs.
      *
      * @param   string A valid, trusted JSON string.
      * @return  object The object encoded by the JSON string.
      * @task json
      */
     parse : function(data) {
       if (typeof data != 'string') {
         return null;
       }
 
       if (window.JSON && JSON.parse) {
         var obj;
         try {
           obj = JSON.parse(data);
         } catch (e) {}
         return obj || null;
       }
 
       return eval('(' + data + ')');
     },
 
     /**
      * Serialize an object into a JSON string. Accepts an object comprised of
      * maps, lists and scalars and transforms it into a JSON representation.
      * This method has undefined behavior if you pass in other complicated
      * things, e.g. object graphs containing cycles, document.body, or Date
      * objects.
      *
      * @param   object  An object comprised of maps, lists and scalars.
      * @return  string  JSON representation of the object.
      * @task json
      */
     stringify : function(val) {
       if (window.JSON && JSON.stringify) {
         return JSON.stringify(val);
       }
 
       var out = [];
       if (
         val === null || val === true || val === false || typeof val == 'number'
       ) {
         return '' + val;
       }
 
       if (val.push && val.pop) {
         var v;
         for (var ii = 0; ii < val.length; ii++) {
 
           // For consistency with JSON.stringify(), encode undefined array
           // indices as null.
           v = (typeof val[ii] == 'undefined') ? null : val[ii];
 
           out.push(JX.JSON.stringify(v));
         }
         return '[' + out.join(',') + ']';
       }
 
       if (typeof val == 'string') {
         return JX.JSON._esc(val);
       }
 
       for (var k in val) {
         out.push(JX.JSON._esc(k) + ':' + JX.JSON.stringify(val[k]));
       }
       return '{' + out.join(',') + '}';
     },
 
 
 /* -(  Internal  )----------------------------------------------------------- */
 
 
     // Lifted more or less directly from Crockford's JSON2.
     _escexp : /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
 
     // List of control character escape codes.
     _meta : {
       '\b' : '\\b',
       '\t' : '\\t',
       '\n' : '\\n',
       '\f' : '\\f',
       '\r' : '\\r',
       '"'  : '\\"',
       '\\' : '\\\\'
     },
 
     /**
      * Quote and escape a string for inclusion in serialized JSON. Finds
      * characters in the string which need to be escaped and uses
      * @{method:_replace} to escape them.
      *
      * @param string Unescaped string.
      * @return string Escaped string.
      * @task internal
      */
     _esc : function(str) {
       JX.JSON._escexp.lastIndex = 0;
       return JX.JSON._escexp.test(str) ?
         '"' + str.replace(JX.JSON._escexp, JX.JSON._replace) + '"' :
         '"' + str + '"';
     },
 
     /**
      * Helper callback for @{method:_esc}, escapes characters which can't be
      * represented normally in serialized JSON.
      *
      * @param string Unescaped character.
      * @return string Escaped character.
      * @task internal
      */
     _replace : function(m) {
       if (m in JX.JSON._meta) {
         return JX.JSON._meta[m];
       }
       return '\\u' + (('0000' + m.charCodeAt(0).toString(16)).slice(-4));
     }
   }
 });
diff --git a/webroot/rsrc/externals/javelin/lib/Mask.js b/webroot/rsrc/externals/javelin/lib/Mask.js
index 881c52fedc..f7b6cabe08 100644
--- a/webroot/rsrc/externals/javelin/lib/Mask.js
+++ b/webroot/rsrc/externals/javelin/lib/Mask.js
@@ -1,109 +1,107 @@
 /**
  * @requires javelin-install
  *           javelin-dom
  * @provides javelin-mask
  * @javelin
  */
 
 /**
  * Show a "mask" over the page for lightboxes or dialogs. This is used by
  * Workflow to draw visual attention to modal dialogs.
  *
  *   JX.Mask.show();
  *   // Show a dialog, lightbox, or other modal UI.
  *   JX.Mask.hide();
  *
  * Masks are stackable, if modal UIs need to spawn other modal UIs.
  *
  * The mask has class `jx-mask`, which you should apply styles to. For example:
  *
  *   .jx-mask {
  *     opacity: 0.8;
  *     background: #000000;
  *     position: fixed;
  *     top: 0;
  *     bottom: 0;
  *     left: 0;
  *     right: 0;
  *     z-index: 2;
  *   }
  *
  * You can create multiple mask styles and select them with the `mask_type`
  * parameter to `show()` (for instance, a light mask for dialogs and a dark
  * mask for lightboxing):
  *
  *   JX.Mask.show('jx-light-mask');
  *   // ...
  *   JX.Mask.hide();
  *
  * This will be applied as a class name to the mask element, which you can
  * customize in CSS:
  *
  *   .jx-light-mask {
  *     background: #ffffff;
  *   }
  *
  * The mask has sigil `jx-mask`, which can be used to intercept events
  * targeting it, like clicks on the mask.
- *
- * @group control
  */
 JX.install('Mask', {
   statics : {
     _stack : [],
     _mask : null,
     _currentType : null,
 
 
     /**
      * Show a mask over the document. Multiple calls push masks onto a stack.
      *
      * @param string Optional class name to apply to the mask, if you have
      *               multiple masks (e.g., one dark and one light).
      * @return void
      */
     show : function(mask_type) {
       var self = JX.Mask;
       mask_type = mask_type || null;
 
       if (!self._stack.length) {
         self._mask = JX.$N('div', {className: 'jx-mask', sigil: 'jx-mask'});
         document.body.appendChild(self._mask);
       }
 
       self._adjustType(mask_type);
       JX.Mask._stack.push(mask_type);
     },
 
     /**
      * Hide the current mask. The mask stack is popped, which may reveal another
      * mask below the current mask.
      *
      * @return void
      */
     hide : function() {
       var self = JX.Mask;
       var mask_type = self._stack.pop();
 
       self._adjustType(mask_type);
 
       if (!self._stack.length) {
         JX.DOM.remove(JX.Mask._mask);
         JX.Mask._mask = null;
       }
     },
 
 
     _adjustType : function(new_type) {
       var self = JX.Mask;
       if (self._currentType) {
         JX.DOM.alterClass(self._mask, self._currentType, false);
         self._currentType = null;
       }
       if (new_type) {
         JX.DOM.alterClass(self._mask, new_type, true);
         self._currentType = new_type;
       }
     }
   }
 });
diff --git a/webroot/rsrc/externals/javelin/lib/Request.js b/webroot/rsrc/externals/javelin/lib/Request.js
index c97ee7d5db..14d13905d0 100644
--- a/webroot/rsrc/externals/javelin/lib/Request.js
+++ b/webroot/rsrc/externals/javelin/lib/Request.js
@@ -1,484 +1,482 @@
 /**
  * @requires javelin-install
  *           javelin-stratcom
  *           javelin-util
  *           javelin-behavior
  *           javelin-json
  *           javelin-dom
  *           javelin-resource
  *           javelin-routable
  * @provides javelin-request
  * @javelin
  */
 
 /**
  * Make basic AJAX XMLHTTPRequests.
- *
- * @group workflow
  */
 JX.install('Request', {
   construct : function(uri, handler) {
     this.setURI(uri);
     if (handler) {
       this.listen('done', handler);
     }
   },
 
   events : ['start', 'open', 'send', 'statechange', 'done', 'error', 'finally',
             'uploadprogress'],
 
   members : {
 
     _xhrkey : null,
     _transport : null,
     _sent : false,
     _finished : false,
     _block : null,
     _data : null,
 
     _getSameOriginTransport : function() {
       try {
         try {
           return new XMLHttpRequest();
         } catch (x) {
           return new ActiveXObject("Msxml2.XMLHTTP");
         }
       } catch (x) {
         return new ActiveXObject("Microsoft.XMLHTTP");
       }
     },
 
     _getCORSTransport : function() {
       try {
         var xport = new XMLHttpRequest();
         if ('withCredentials' in xport) {
           // XHR supports CORS
         } else if (typeof XDomainRequest != 'undefined') {
           xport = new XDomainRequest();
         }
         return xport;
       } catch (x) {
         return new XDomainRequest();
       }
     },
 
     getTransport : function() {
       if (!this._transport) {
         this._transport = this.getCORS() ? this._getCORSTransport() :
                                            this._getSameOriginTransport();
       }
       return this._transport;
     },
 
     getRoutable: function() {
       var routable = new JX.Routable();
       routable.listen('start', JX.bind(this, function() {
         // Pass the event to allow other listeners to "start" to configure this
         // request before it fires.
         JX.Stratcom.pass(JX.Stratcom.context());
         this.send();
       }));
       this.listen('finally', JX.bind(routable, routable.done));
       return routable;
     },
 
     send : function() {
       if (this._sent || this._finished) {
         if (__DEV__) {
           if (this._sent) {
             JX.$E(
               'JX.Request.send(): ' +
               'attempting to send a Request that has already been sent.');
           }
           if (this._finished) {
             JX.$E(
               'JX.Request.send(): ' +
               'attempting to send a Request that has finished or aborted.');
           }
         }
         return;
       }
 
       // Fire the "start" event before doing anything. A listener may
       // perform pre-processing or validation on this request
       this.invoke('start', this);
       if (this._finished) {
         return;
       }
 
       var xport = this.getTransport();
       xport.onreadystatechange = JX.bind(this, this._onreadystatechange);
       if (xport.upload) {
         xport.upload.onprogress = JX.bind(this, this._onuploadprogress);
       }
 
       var method = this.getMethod().toUpperCase();
 
       if (__DEV__) {
         if (this.getRawData()) {
           if (method != 'POST') {
             JX.$E(
               'JX.Request.send(): ' +
               'attempting to send post data over GET. You must use POST.');
           }
         }
       }
 
       var list_of_pairs = this._data || [];
       list_of_pairs.push(['__ajax__', true]);
 
       this._block = JX.Stratcom.allocateMetadataBlock();
       list_of_pairs.push(['__metablock__', this._block]);
 
       var q = (this.getDataSerializer() ||
                JX.Request.defaultDataSerializer)(list_of_pairs);
       var uri = this.getURI();
 
       // If we're sending a file, submit the metadata via the URI instead of
       // via the request body, because the entire post body will be consumed by
       // the file content.
       if (method == 'GET' || this.getRawData()) {
         uri += ((uri.indexOf('?') === -1) ? '?' : '&') + q;
       }
 
       if (this.getTimeout()) {
         this._timer = setTimeout(
           JX.bind(
             this,
             this._fail,
             JX.Request.ERROR_TIMEOUT),
           this.getTimeout());
       }
 
       xport.open(method, uri, true);
 
       // Must happen after xport.open so that listeners can modify the transport
       // Some transport properties can only be set after the transport is open
       this.invoke('open', this);
       if (this._finished) {
         return;
       }
 
       this.invoke('send', this);
       if (this._finished) {
         return;
       }
 
       if (method == 'POST') {
         if (this.getRawData()) {
           xport.send(this.getRawData());
         } else {
           xport.setRequestHeader(
             'Content-Type',
             'application/x-www-form-urlencoded');
           xport.send(q);
         }
       } else {
         xport.send(null);
       }
 
       this._sent = true;
     },
 
     abort : function() {
       this._cleanup();
     },
 
     _onuploadprogress : function(progress) {
       this.invoke('uploadprogress', progress);
     },
 
     _onreadystatechange : function() {
       var xport = this.getTransport();
       var response;
       try {
         this.invoke('statechange', this);
         if (this._finished) {
           return;
         }
         if (xport.readyState != 4) {
           return;
         }
         // XHR requests to 'file:///' domains return 0 for success, which is why
         // we treat it as a good result in addition to HTTP 2XX responses.
         if (xport.status !== 0 && (xport.status < 200 || xport.status >= 300)) {
           this._fail();
           return;
         }
 
         if (__DEV__) {
           var expect_guard = this.getExpectCSRFGuard();
 
           if (!xport.responseText.length) {
             JX.$E(
               'JX.Request("'+this.getURI()+'", ...): '+
               'server returned an empty response.');
           }
           if (expect_guard && xport.responseText.indexOf('for (;;);') !== 0) {
             JX.$E(
               'JX.Request("'+this.getURI()+'", ...): '+
               'server returned an invalid response.');
           }
           if (expect_guard && xport.responseText == 'for (;;);') {
             JX.$E(
               'JX.Request("'+this.getURI()+'", ...): '+
               'server returned an empty response.');
           }
         }
 
         response = this._extractResponse(xport);
         if (!response) {
           JX.$E(
             'JX.Request("'+this.getURI()+'", ...): '+
             'server returned an invalid response.');
         }
       } catch (exception) {
 
         if (__DEV__) {
           JX.log(
             'JX.Request("'+this.getURI()+'", ...): '+
             'caught exception processing response: '+exception);
         }
         this._fail();
         return;
       }
 
       try {
         this._handleResponse(response);
         this._cleanup();
       } catch (exception) {
         //  In Firefox+Firebug, at least, something eats these. :/
         setTimeout(function() {
           throw exception;
         }, 0);
       }
     },
 
     _extractResponse : function(xport) {
       var text = xport.responseText;
 
       if (this.getExpectCSRFGuard()) {
         text = text.substring('for (;;);'.length);
       }
 
       var type = this.getResponseType().toUpperCase();
       if (type == 'TEXT') {
         return text;
       } else if (type == 'JSON' || type == 'JAVELIN') {
         return JX.JSON.parse(text);
       } else if (type == 'XML') {
         var doc;
         try {
           if (typeof DOMParser != 'undefined') {
             var parser = new DOMParser();
             doc = parser.parseFromString(text, "text/xml");
           } else {  // IE
             // an XDomainRequest
             doc = new ActiveXObject("Microsoft.XMLDOM");
             doc.async = false;
             doc.loadXML(xport.responseText);
           }
 
           return doc.documentElement;
         } catch (exception) {
           if (__DEV__) {
             JX.log(
               'JX.Request("'+this.getURI()+'", ...): '+
               'caught exception extracting response: '+exception);
           }
           this._fail();
           return null;
         }
       }
 
       if (__DEV__) {
         JX.$E(
           'JX.Request("'+this.getURI()+'", ...): '+
           'unrecognized response type.');
       }
       return null;
     },
 
     _fail : function(error) {
       this._cleanup();
 
       this.invoke('error', error, this);
       this.invoke('finally');
     },
 
     _done : function(response) {
       this._cleanup();
 
       if (response.onload) {
         for (var ii = 0; ii < response.onload.length; ii++) {
           (new Function(response.onload[ii]))();
         }
       }
 
       var payload;
       if (this.getRaw()) {
         payload = response;
       } else {
         payload = response.payload;
         JX.Request._parseResponsePayload(payload);
       }
 
       this.invoke('done', payload, this);
       this.invoke('finally');
     },
 
     _cleanup : function() {
       this._finished = true;
       clearTimeout(this._timer);
       this._timer = null;
 
       // Should not abort the transport request if it has already completed
       // Otherwise, we may see an "HTTP request aborted" error in the console
       // despite it possibly having succeeded.
       if (this._transport && this._transport.readyState != 4) {
         this._transport.abort();
       }
     },
 
     setData : function(dictionary) {
       this._data = null;
       this.addData(dictionary);
       return this;
     },
 
     addData : function(dictionary) {
       if (!this._data) {
         this._data = [];
       }
       for (var k in dictionary) {
         this._data.push([k, dictionary[k]]);
       }
       return this;
     },
 
     setDataWithListOfPairs : function(list_of_pairs) {
       this._data = list_of_pairs;
       return this;
     },
 
     _handleResponse : function(response) {
       if (this.getResponseType().toUpperCase() == 'JAVELIN') {
         if (response.error) {
           this._fail(response.error);
         } else {
           JX.Stratcom.mergeData(
             this._block,
             response.javelin_metadata || {});
 
           var when_complete = JX.bind(this, function() {
             this._done(response);
             JX.initBehaviors(response.javelin_behaviors || {});
           });
 
           if (response.javelin_resources) {
             JX.Resource.load(response.javelin_resources, when_complete);
           } else {
             when_complete();
           }
         }
       } else {
         this._cleanup();
         this.invoke('done', response, this);
         this.invoke('finally');
       }
     }
   },
 
   statics : {
     ERROR_TIMEOUT : -9000,
     defaultDataSerializer : function(list_of_pairs) {
       var uri = [];
       for (var ii = 0; ii < list_of_pairs.length; ii++) {
         var pair = list_of_pairs[ii];
         var name = encodeURIComponent(pair[0]);
         var value = encodeURIComponent(pair[1]);
         uri.push(name + '=' + value);
       }
       return uri.join('&');
     },
 
     /**
      * When we receive a JSON blob, parse it to introduce meaningful objects
      * where there are magic keys for placeholders.
      *
      * Objects with the magic key '__html' are translated into JX.HTML objects.
      *
      * This function destructively modifies its input.
      */
     _parseResponsePayload: function(parent, index) {
       var recurse = JX.Request._parseResponsePayload;
       var obj = (typeof index !== 'undefined') ? parent[index] : parent;
       if (JX.isArray(obj)) {
         for (var ii = 0; ii < obj.length; ii++) {
           recurse(obj, ii);
         }
       } else if (obj && typeof obj == 'object') {
         if (('__html' in obj) && (obj.__html !== null)) {
           parent[index] = JX.$H(obj.__html);
         } else {
           for (var key in obj) {
             recurse(obj, key);
           }
         }
       }
     }
   },
 
   properties : {
     URI : null,
     dataSerializer : null,
     /**
      * Configure which HTTP method to use for the request. Permissible values
      * are "POST" (default) or "GET".
      *
      * @param string HTTP method, one of "POST" or "GET".
      */
     method : 'POST',
     /**
      * Set the data parameter of transport.send. Useful if you want to send a
      * file or FormData. Not that you cannot send raw data and data at the same
      * time.
      *
      * @param Data, argument to transport.send
      */
     rawData: null,
     raw : false,
 
     /**
      * Configure a timeout, in milliseconds. If the request has not resolved
      * (either with success or with an error) within the provided timeframe,
      * it will automatically fail with error JX.Request.ERROR_TIMEOUT.
      *
      * @param int Timeout, in milliseconds (e.g. 3000 = 3 seconds).
      */
     timeout : null,
 
     /**
      * Whether or not we should expect the CSRF guard in the response.
      *
      * @param bool
      */
     expectCSRFGuard : true,
 
     /**
      * Whether it should be a CORS (Cross-Origin Resource Sharing) request to
      * a third party domain other than the current site.
      *
      * @param bool
      */
     CORS : false,
 
     /**
      * Type of the response.
      *
      * @param enum 'JAVELIN', 'JSON', 'XML', 'TEXT'
      */
     responseType : 'JAVELIN'
   }
 
 });
diff --git a/webroot/rsrc/externals/javelin/lib/URI.js b/webroot/rsrc/externals/javelin/lib/URI.js
index e22982cc6b..362bd92f25 100644
--- a/webroot/rsrc/externals/javelin/lib/URI.js
+++ b/webroot/rsrc/externals/javelin/lib/URI.js
@@ -1,246 +1,242 @@
 /**
  * @provides javelin-uri
  * @requires javelin-install
  *           javelin-util
  *           javelin-stratcom
  *
  * @javelin-installs JX.$U
  *
  * @javelin
  */
 
 /**
  * Handy convenience function that returns a @{class:JX.URI} instance. This
  * allows you to write things like:
  *
  *   JX.$U('http://zombo.com/').getDomain();
  *
  * @param string            Unparsed URI.
  * @return  @{class:JX.URI} JX.URI instance.
- *
- * @group uri
  */
 JX.$U = function(uri) {
   return new JX.URI(uri);
 };
 
 /**
  * Convert a string URI into a maleable object.
  *
  *   var uri = new JX.URI('http://www.example.com/asdf.php?a=b&c=d#anchor123');
  *   uri.getProtocol();    // http
  *   uri.getDomain();      // www.example.com
  *   uri.getPath();        // /asdf.php
  *   uri.getQueryParams(); // {a: 'b', c: 'd'}
  *   uri.getFragment();    // anchor123
  *
  * ...and back into a string:
  *
  *   uri.setFragment('clowntown');
  *   uri.toString() // http://www.example.com/asdf.php?a=b&c=d#clowntown
- *
- * @group uri
  */
 JX.install('URI', {
   statics : {
     _uriPattern : /(?:([^:\/?#]+):)?(?:\/\/([^:\/?#]*)(?::(\d*))?)?([^?#]*)(?:\?([^#]*))?(?:#(.*))?/,
 
     /**
      *  Convert a Javascript object into an HTTP query string.
      *
      *  @param  Object  Map of query keys to values.
      *  @return String  HTTP query string, like 'cow=quack&duck=moo'.
      */
     _defaultQuerySerializer : function(obj) {
       var kv_pairs = [];
       for (var key in obj) {
         if (obj[key] !== null) {
           var value = encodeURIComponent(obj[key]);
           kv_pairs.push(encodeURIComponent(key) + (value ? '=' + value : ''));
         }
       }
 
       return kv_pairs.join('&');
     },
 
     _decode : function(str) {
       return decodeURIComponent(str.replace(/\+/g, ' '));
     }
   },
 
   /**
    * Construct a URI
    *
    * Accepts either absolute or relative URIs. Relative URIs may have protocol
    * and domain properties set to undefined
    *
    * @param string    absolute or relative URI
    */
   construct : function(uri) {
     // need to set the default value here rather than in the properties map,
     // or else we get some crazy global state breakage
     this.setQueryParams({});
 
     if (uri) {
       // parse the url
       var result = JX.URI._uriPattern.exec(uri);
 
       // fallback to undefined because IE has weird behavior otherwise
       this.setProtocol(result[1] || undefined);
       this.setDomain(result[2] || undefined);
       this.setPort(result[3] || undefined);
       var path = result[4];
       var query = result[5];
       this.setFragment(result[6] || undefined);
 
       // parse the path
       this.setPath(path.charAt(0) == '/' ? path : '/' + path);
 
       // parse the query data
       if (query && query.length) {
         var dict = {};
         var parts = query.split('&');
         for (var ii = 0; ii < parts.length; ii++) {
           var part = parts[ii];
           if (!part.length) {
             continue;
           }
           var pieces = part.split('=');
           var name = pieces[0];
           if (!name.length) {
             continue;
           }
           var value = pieces.slice(1).join('=') || '';
           dict[JX.URI._decode(name)] = JX.URI._decode(value);
         }
         this.setQueryParams(dict);
       }
     }
   },
 
   properties : {
     protocol: undefined,
     port: undefined,
     path: undefined,
     queryParams: undefined,
     fragment: undefined,
     querySerializer: undefined
   },
 
   members : {
     _domain: undefined,
 
     /**
      * Append and override query data values
      * Remove a query key by setting it undefined
      *
      * @param map
      * @return @{JX.URI} self
      */
     addQueryParams : function(map) {
       JX.copy(this.getQueryParams(), map);
       return this;
     },
 
     /**
      * Set a specific query parameter
      * Remove a query key by setting it undefined
      *
      * @param string
      * @param wild
      * @return @{JX.URI} self
      */
     setQueryParam : function(key, value) {
       var map = {};
       map[key] = value;
       return this.addQueryParams(map);
     },
 
     /**
      * Set the domain
      *
      * This function checks the domain name to ensure that it is safe for
      * browser consumption.
      */
     setDomain : function(domain) {
       var re = new RegExp(
         // For the bottom 128 code points, we use a strict whitelist of
         // characters that are allowed by all browsers: -.0-9:A-Z[]_a-z
         '[\\x00-\\x2c\\x2f\\x3b-\\x40\\x5c\\x5e\\x60\\x7b-\\x7f' +
         // In IE, these chararacters cause problems when entity-encoded.
         '\\uFDD0-\\uFDEF\\uFFF0-\\uFFFF' +
         // In Safari, these characters terminate the hostname.
         '\\u2047\\u2048\\uFE56\\uFE5F\\uFF03\\uFF0F\\uFF1F]');
       if (re.test(domain)) {
         JX.$E('JX.URI.setDomain(...): invalid domain specified.');
       }
       this._domain = domain;
       return this;
     },
 
     getDomain : function() {
       return this._domain;
     },
 
     toString : function() {
       if (__DEV__) {
         if (this.getPath() && this.getPath().charAt(0) != '/') {
           JX.$E(
             'JX.URI.toString(): ' +
             'Path does not begin with a "/" which means this URI will likely' +
             'be malformed. Ensure any string passed to .setPath() leads "/"');
         }
       }
       var str = '';
       if (this.getProtocol()) {
         str += this.getProtocol() + '://';
       }
       str += this.getDomain() || '';
 
       if (this.getPort()) {
         str += ':' + this.getPort();
       }
 
       // If there is a domain or a protocol, we need to provide '/' for the
       // path. If we don't have either and also don't have a path, we can omit
       // it to produce a partial URI without path information which begins
       // with "?", "#", or is empty.
       str += this.getPath() || (str ? '/' : '');
 
       str += this._getQueryString();
       if (this.getFragment()) {
         str += '#' + this.getFragment();
       }
       return str;
     },
 
     _getQueryString : function() {
       var str = (
         this.getQuerySerializer() || JX.URI._defaultQuerySerializer
       )(this.getQueryParams());
       return str ? '?' + str : '';
     },
 
     /**
      * Redirect the browser to another page by changing the window location. If
      * the URI is empty, reloads the current page.
      *
      * You can install a Stratcom listener for the 'go' event if you need to log
      * or prevent redirects.
      *
      * @return void
      */
     go : function() {
       var uri = this.toString();
       if (JX.Stratcom.invoke('go', null, {uri: uri}).getPrevented()) {
         return;
       }
       if (!uri) {
         // window.location.reload clears cache in Firefox.
         uri = window.location.pathname + (window.location.query || '');
       }
       window.location = uri;
     }
 
   }
 });
diff --git a/webroot/rsrc/externals/javelin/lib/Vector.js b/webroot/rsrc/externals/javelin/lib/Vector.js
index 0fa6cbcba3..4c155e18a8 100644
--- a/webroot/rsrc/externals/javelin/lib/Vector.js
+++ b/webroot/rsrc/externals/javelin/lib/Vector.js
@@ -1,365 +1,361 @@
 /**
  * @requires javelin-install
  *           javelin-event
  * @provides javelin-vector
  *
  * @javelin-installs JX.$V
  *
  * @javelin
  */
 
 
 /**
  * Convenience function that returns a @{class:JX.Vector} instance. This allows
  * you to concisely write things like:
  *
  *  JX.$V(x, y).add(10, 10);                // Explicit coordinates.
  *  JX.$V(node).add(50, 50).setDim(node);   // Position of a node.
  *
  * @param number|Node         If a node, returns the node's position vector.
  *                            If numeric, the x-coordinate for the new vector.
  * @param number?             The y-coordinate for the new vector.
  * @return @{class:JX.Vector} New vector.
- *
- * @group dom
  */
 JX.$V = function(x, y) {
   return new JX.Vector(x, y);
 };
 
 
 /**
  * Query and update positions and dimensions of nodes (and other things) within
  * within a document. Each vector has two elements, 'x' and 'y', which usually
  * represent width/height ('dimension vector') or left/top ('position vector').
  *
  * Vectors are used to manage the sizes and positions of elements, events,
  * the document, and the viewport (the visible section of the document, i.e.
  * how much of the page the user can actually see in their browser window).
  * Unlike most Javelin classes, @{class:JX.Vector} exposes two bare properties,
  * 'x' and 'y'. You can read and manipulate these directly:
  *
  *   // Give the user information about elements when they click on them.
  *   JX.Stratcom.listen(
  *     'click',
  *     null,
  *     function(e) {
  *       var p = new JX.Vector(e);
  *       var d = JX.Vector.getDim(e.getTarget());
  *
  *       alert('You clicked at <' + p.x + ',' + p.y + '> and the element ' +
  *             'you clicked is ' + d.x + 'px wide and ' + d.y + 'px high.');
  *     });
  *
  * You can also update positions and dimensions using vectors:
  *
  *   // When the user clicks on something, make it 10px wider and 10px taller.
  *   JX.Stratcom.listen(
  *     'click',
  *     null,
  *     function(e) {
  *       var target = e.getTarget();
  *       JX.$V(target).add(10, 10).setDim(target);
  *     });
  *
  * Additionally, vectors can be used to query document and viewport information:
  *
  *   var v = JX.Vector.getViewport(); // Viewport (window) width and height.
  *   var d = JX.Vector.getDocument(); // Document width and height.
  *   var visible_area = parseInt(100 * (v.x * v.y) / (d.x * d.y), 10);
  *   alert('You can currently see ' + visible_area + ' % of the document.');
  *
  * The function @{function:JX.$V} provides convenience construction of common
  * vectors.
  *
  * @task query  Querying Positions and Dimensions
  * @task update Changing Positions and Dimensions
  * @task manip  Manipulating Vectors
- *
- * @group dom
  */
 JX.install('Vector', {
 
   /**
    * Construct a vector, either from explicit coordinates or from a node
    * or event. You can pass two Numbers to construct an explicit vector:
    *
    *   var p = new JX.Vector(35, 42);
    *
    * Otherwise, you can pass a @{class:JX.Event} or a Node to implicitly
    * construct a vector:
    *
    *   var q = new JX.Vector(some_event);
    *   var r = new JX.Vector(some_node);
    *
    * These are just like calling JX.Vector.getPos() on the @{class:JX.Event} or
    * Node.
    *
    * For convenience, @{function:JX.$V} constructs a new vector so you don't
    * need to use the 'new' keyword. That is, these are equivalent:
    *
    *   var s = new JX.Vector(x, y);
    *   var t = JX.$V(x, y);
    *
    * Methods like @{method:getScroll}, @{method:getViewport} and
    * @{method:getDocument} also create new vectors.
    *
    * Once you have a vector, you can manipulate it with add():
    *
    *   var u = JX.$V(35, 42);
    *   var v = u.add(5, -12); // v = <40, 30>
    *
    * @param wild      'x' component of the vector, or a @{class:JX.Event}, or a
    *                  Node.
    * @param Number?   If providing an 'x' component, the 'y' component of the
    *                  vector.
    * @return @{class:JX.Vector} Specified vector.
    * @task query
    */
   construct : function(x, y) {
     if (typeof y == 'undefined') {
       return JX.Vector.getPos(x);
     }
 
     this.x = (x === null) ? null : parseFloat(x);
     this.y = (y === null) ? null : parseFloat(y);
   },
 
   members : {
     x : null,
     y : null,
 
     /**
      * Move a node around by setting the position of a Node to the vector's
      * coordinates. For instance, if you want to move an element to the top left
      * corner of the document, you could do this (assuming it has 'position:
      * absolute'):
      *
      *   JX.$V(0, 0).setPos(node);
      *
      * @param Node Node to move.
      * @return this
      * @task update
      */
     setPos : function(node) {
       node.style.left = (this.x === null) ? '' : (parseInt(this.x, 10) + 'px');
       node.style.top  = (this.y === null) ? '' : (parseInt(this.y, 10) + 'px');
       return this;
     },
 
     /**
      * Change the size of a node by setting its dimensions to the vector's
      * coordinates. For instance, if you want to change an element to be 100px
      * by 100px:
      *
      *   JX.$V(100, 100).setDim(node);
      *
      * Or if you want to expand a node's dimensions by 50px:
      *
      *   JX.$V(node).add(50, 50).setDim(node);
      *
      * @param Node Node to resize.
      * @return this
      * @task update
      */
     setDim : function(node) {
       node.style.width =
         (this.x === null) ? '' : (parseInt(this.x, 10) + 'px');
       node.style.height =
         (this.y === null) ? '' : (parseInt(this.y, 10) + 'px');
       return this;
     },
 
     /**
      * Change a vector's x and y coordinates by adding numbers to them, or
      * adding the coordinates of another vector. For example:
      *
      *   var u = JX.$V(3, 4).add(100, 200); // u = <103, 204>
      *
      * You can also add another vector:
      *
      *   var q = JX.$V(777, 999);
      *   var r = JX.$V(1000, 2000);
      *   var s = q.add(r); // s = <1777, 2999>
      *
      * Note that this method returns a new vector. It does not modify the
      * 'this' vector.
      *
      * @param wild      Value to add to the vector's x component, or another
      *                  vector.
      * @param Number?   Value to add to the vector's y component.
      * @return @{class:JX.Vector} New vector, with summed components.
      * @task manip
      */
     add : function(x, y) {
       if (x instanceof JX.Vector) {
         y = x.y;
         x = x.x;
       }
       return new JX.Vector(this.x + parseFloat(x), this.y + parseFloat(y));
     }
   },
 
   statics : {
     _viewport: null,
 
     /**
      * Determine where in a document an element is (or where an event, like
      * a click, occurred) by building a new vector containing the position of a
      * Node or @{class:JX.Event}. The 'x' component of the vector will
      * correspond to the pixel offset of the argument relative to the left edge
      * of the document, and the 'y' component will correspond to the pixel
      * offset of the argument relative to the top edge of the document. Note
      * that all vectors are generated in document coordinates, so the scroll
      * position does not affect them.
      *
      * See also @{method:getDim}, used to determine an element's dimensions.
      *
      * @param  Node|@{class:JX.Event}  Node or event to determine the position
      *                                 of.
      * @return @{class:JX.Vector}      New vector with the argument's position.
      * @task query
      */
     getPos : function(node) {
       JX.Event && (node instanceof JX.Event) && (node = node.getRawEvent());
 
       if (node.getBoundingClientRect) {
         var rect;
         try {
           rect = node.getBoundingClientRect();
         } catch (e) {
           rect = { top : 0, left : 0 };
         }
         return new JX.Vector(
           rect.left + window.pageXOffset,
           rect.top + window.pageYOffset);
       }
 
       if (('pageX' in node) || ('clientX' in node)) {
         var c = JX.Vector._viewport;
         return new JX.Vector(
           node.pageX || (node.clientX + c.scrollLeft),
           node.pageY || (node.clientY + c.scrollTop)
         );
       }
 
       var x = 0;
       var y = 0;
       do {
         var offsetParent = node.offsetParent;
         var scrollLeft = 0;
         var scrollTop = 0;
         if (offsetParent && offsetParent != document.body) {
           scrollLeft = offsetParent.scrollLeft;
           scrollTop = offsetParent.scrollTop;
         }
         x += (node.offsetLeft - scrollLeft);
         y += (node.offsetTop - scrollTop);
         node = offsetParent;
       } while (node && node != document.body);
 
       return new JX.Vector(x, y);
     },
 
     /**
      * Determine the width and height of a node by building a new vector with
      * dimension information. The 'x' component of the vector will correspond
      * to the element's width in pixels, and the 'y' component will correspond
      * to its height in pixels.
      *
      * See also @{method:getPos}, used to determine an element's position.
      *
      * @param  Node      Node to determine the display size of.
      * @return @{JX.$V}  New vector with the node's dimensions.
      * @task query
      */
     getDim : function(node) {
       return new JX.Vector(node.offsetWidth, node.offsetHeight);
     },
 
     /**
      * Determine the current scroll position by building a new vector where
      * the 'x' component corresponds to how many pixels the user has scrolled
      * from the left edge of the document, and the 'y' component corresponds to
      * how many pixels the user has scrolled from the top edge of the document.
      *
      * See also @{method:getViewport}, used to determine the size of the
      * viewport.
      *
      * @return @{JX.$V}  New vector with the document scroll position.
      * @task query
      */
     getScroll : function() {
       // We can't use JX.Vector._viewport here because there's diversity between
       // browsers with respect to where position/dimension and scroll position
       // information is stored.
       var b = document.body;
       var e = document.documentElement;
       return new JX.Vector(
         window.pageXOffset || b.scrollLeft || e.scrollLeft,
         window.pageYOffset || b.scrollTop || e.scrollTop
       );
     },
 
     /**
      * Determine the size of the viewport (basically, the browser window) by
      * building a new vector where the 'x' component corresponds to the width
      * of the viewport in pixels and the 'y' component corresponds to the height
      * of the viewport in pixels.
      *
      * See also @{method:getScroll}, used to determine the position of the
      * viewport, and @{method:getDocument}, used to determine the size of the
      * entire document.
      *
      * @return @{class:JX.Vector}  New vector with the viewport dimensions.
      * @task query
      */
     getViewport : function() {
       var c = JX.Vector._viewport;
       return new JX.Vector(
         window.innerWidth || c.clientWidth || 0,
         window.innerHeight || c.clientHeight || 0
       );
     },
 
     /**
      * Determine the size of the document, including any area outside the
      * current viewport which the user would need to scroll in order to see, by
      * building a new vector where the 'x' component corresponds to the document
      * width in pixels and the 'y' component corresponds to the document height
      * in pixels.
      *
      * @return @{class:JX.Vector} New vector with the document dimensions.
      * @task query
      */
     getDocument : function() {
       var c = JX.Vector._viewport;
       return new JX.Vector(c.scrollWidth || 0, c.scrollHeight || 0);
     }
   },
 
   /**
    * On initialization, the browser-dependent viewport root is determined and
    * stored.
    *
    * In ##__DEV__##, @{class:JX.Vector} installs a toString() method so
    * vectors print in a debuggable way:
    *
    *   <23, 92>
    *
    * This string representation of vectors is not available in a production
    * context.
    *
    * @return void
    */
   initialize : function() {
     JX.Vector._viewport = document.documentElement || document.body;
 
     if (__DEV__) {
       JX.Vector.prototype.toString = function() {
         return '<' + this.x + ', ' + this.y + '>';
       };
     }
   }
 
 });
diff --git a/webroot/rsrc/externals/javelin/lib/Workflow.js b/webroot/rsrc/externals/javelin/lib/Workflow.js
index b6b432b0ac..da7e77e815 100644
--- a/webroot/rsrc/externals/javelin/lib/Workflow.js
+++ b/webroot/rsrc/externals/javelin/lib/Workflow.js
@@ -1,348 +1,345 @@
 /**
  * @requires javelin-stratcom
  *           javelin-request
  *           javelin-dom
  *           javelin-vector
  *           javelin-install
  *           javelin-util
  *           javelin-mask
  *           javelin-uri
  *           javelin-routable
  * @provides javelin-workflow
  * @javelin
  */
 
-/**
- * @group workflow
- */
 JX.install('Workflow', {
   construct : function(uri, data) {
     if (__DEV__) {
       if (!uri || uri == '#') {
         JX.$E(
           'new JX.Workflow(<?>, ...): '+
           'bogus URI provided when creating workflow.');
       }
     }
     this.setURI(uri);
     this.setData(data || {});
   },
 
   events : ['error', 'finally', 'submit'],
 
   statics : {
     _stack   : [],
     newFromForm : function(form, data) {
       var pairs = JX.DOM.convertFormToListOfPairs(form);
       for (var k in data) {
         pairs.push([k, data[k]]);
       }
 
       // Disable form elements during the request
       var inputs = [].concat(
         JX.DOM.scry(form, 'input'),
         JX.DOM.scry(form, 'button'),
         JX.DOM.scry(form, 'textarea'));
       for (var ii = 0; ii < inputs.length; ii++) {
         if (inputs[ii].disabled) {
           delete inputs[ii];
         } else {
           inputs[ii].disabled = true;
         }
       }
 
       var workflow = new JX.Workflow(form.getAttribute('action'), {});
       workflow.setDataWithListOfPairs(pairs);
       workflow.setMethod(form.getAttribute('method'));
       workflow.listen('finally', function() {
         // Re-enable form elements
         for (var ii = 0; ii < inputs.length; ii++) {
           inputs[ii] && (inputs[ii].disabled = false);
         }
       });
       return workflow;
     },
     newFromLink : function(link) {
       var workflow = new JX.Workflow(link.href);
       return workflow;
     },
     _push : function(workflow) {
       JX.Mask.show();
       JX.Workflow._stack.push(workflow);
     },
     _pop : function() {
       var dialog = JX.Workflow._stack.pop();
       (dialog.getCloseHandler() || JX.bag)();
       dialog._destroy();
       JX.Mask.hide();
     },
     disable : function() {
       JX.Workflow._disabled = true;
     },
     _onbutton : function(event) {
 
       if (JX.Stratcom.pass()) {
         return;
       }
 
       if (JX.Workflow._disabled) {
         return;
       }
 
       // Get the button (which is sometimes actually another tag, like an <a />)
       // which triggered the event. In particular, this makes sure we get the
       // right node if there is a <button> with an <img /> inside it or
       // or something similar.
       var t = event.getNode('jx-workflow-button') ||
               event.getNode('tag:button');
 
       // If this button disables workflow (normally, because it is a file
       // download button) let the event through without modification.
       if (JX.Stratcom.getData(t).disableWorkflow) {
         return;
       }
 
       event.prevent();
 
       if (t.name == '__cancel__' || t.name == '__close__') {
         JX.Workflow._pop();
       } else {
         var form = event.getNode('jx-dialog');
         JX.Workflow._dosubmit(form, t);
       }
     },
     _onsyntheticsubmit : function(e) {
       if (JX.Stratcom.pass()) {
         return;
       }
       if (JX.Workflow._disabled) {
         return;
       }
       e.prevent();
       var form = e.getNode('jx-dialog');
       var button = JX.DOM.find(form, 'button', '__default__');
       JX.Workflow._dosubmit(form, button);
     },
     _dosubmit : function(form, button) {
       // Issue a DOM event first, so form-oriented handlers can act.
       var dom_event = JX.DOM.invoke(form, 'didWorkflowSubmit');
       if (dom_event.getPrevented()) {
         return;
       }
 
       var data = JX.DOM.convertFormToListOfPairs(form);
       data.push([button.name, button.value || true]);
 
       var active = JX.Workflow._getActiveWorkflow();
       var e = active.invoke('submit', {form: form, data: data});
       if (!e.getStopped()) {
         active._destroy();
         active
           .setURI(form.getAttribute('action') || active.getURI())
           .setDataWithListOfPairs(data)
           .start();
       }
     },
     _getActiveWorkflow : function() {
       var stack = JX.Workflow._stack;
       return stack[stack.length - 1];
     }
   },
 
   members : {
     _root : null,
     _pushed : false,
     _data : null,
     _onload : function(r) {
       // It is permissible to send back a falsey redirect to force a page
       // reload, so we need to take this branch if the key is present.
       if (r && (typeof r.redirect != 'undefined')) {
         JX.$U(r.redirect).go();
       } else if (r && r.dialog) {
         this._push();
         this._root = JX.$N(
           'div',
           {className: 'jx-client-dialog'},
           JX.$H(r.dialog));
         JX.DOM.listen(
           this._root,
           'click',
           [['jx-workflow-button'], ['tag:button']],
           JX.Workflow._onbutton);
         JX.DOM.listen(
           this._root,
           'didSyntheticSubmit',
           [],
           JX.Workflow._onsyntheticsubmit);
         document.body.appendChild(this._root);
         var d = JX.Vector.getDim(this._root);
         var v = JX.Vector.getViewport();
         var s = JX.Vector.getScroll();
 
         // Normally, we position dialogs 100px from the top of the screen.
         // Use more space if the dialog is large (at least roughly the size
         // of the viewport).
         var offset = Math.min(Math.max(20, (v.y - d.y) / 2), 100);
         JX.$V((v.x - d.x) / 2, s.y + offset).setPos(this._root);
 
         try {
           JX.DOM.focus(JX.DOM.find(this._root, 'button', '__default__'));
           var inputs = JX.DOM.scry(this._root, 'input')
                          .concat(JX.DOM.scry(this._root, 'textarea'));
           var miny = Number.POSITIVE_INFINITY;
           var target = null;
           for (var ii = 0; ii < inputs.length; ++ii) {
             if (inputs[ii].type != 'hidden') {
               // Find the topleft-most displayed element.
               var p = JX.$V(inputs[ii]);
               if (p.y < miny) {
                  miny = p.y;
                  target = inputs[ii];
               }
             }
           }
           target && JX.DOM.focus(target);
         } catch (_ignored) {}
 
         // The `focus()` call may have scrolled the window. Scroll it back to
         // where it was before -- we want to focus the control, but not adjust
         // the scroll position.
         window.scrollTo(s.x, s.y);
 
       } else if (this.getHandler()) {
         this.getHandler()(r);
         this._pop();
       } else if (r) {
         if (__DEV__) {
           JX.$E('Response to workflow request went unhandled.');
         }
       }
     },
     _push : function() {
       if (!this._pushed) {
         this._pushed = true;
         JX.Workflow._push(this);
       }
     },
     _pop : function() {
       if (this._pushed) {
         this._pushed = false;
         JX.Workflow._pop();
       }
     },
     _destroy : function() {
       if (this._root) {
         JX.DOM.remove(this._root);
         this._root = null;
       }
     },
     start : function() {
       var uri = this.getURI();
       var method = this.getMethod();
       var r = new JX.Request(uri, JX.bind(this, this._onload));
       var list_of_pairs = this._data;
       list_of_pairs.push(['__wflow__', true]);
       r.setDataWithListOfPairs(list_of_pairs);
       r.setDataSerializer(this.getDataSerializer());
       if (method) {
         r.setMethod(method);
       }
       r.listen('finally', JX.bind(this, this.invoke, 'finally'));
       r.listen('error', JX.bind(this, function(error) {
         var e = this.invoke('error', error);
         if (e.getStopped()) {
           return;
         }
         // TODO: Default error behavior? On Facebook Lite, we just shipped the
         // user to "/error/". We could emit a blanket 'workflow-failed' type
         // event instead.
       }));
       r.send();
     },
 
     getRoutable: function() {
       var routable = new JX.Routable();
       routable.listen('start', JX.bind(this, function() {
         // Pass the event to allow other listeners to "start" to configure this
         // workflow before it fires.
         JX.Stratcom.pass(JX.Stratcom.context());
         this.start();
       }));
       this.listen('finally', JX.bind(routable, routable.done));
       return routable;
     },
 
     setData : function(dictionary) {
       this._data = [];
       for (var k in dictionary) {
         this._data.push([k, dictionary[k]]);
       }
       return this;
     },
 
     setDataWithListOfPairs : function(list_of_pairs) {
       this._data = list_of_pairs;
       return this;
     }
   },
 
   properties : {
     handler : null,
     closeHandler : null,
     dataSerializer : null,
     method : null,
     URI : null
   },
 
   initialize : function() {
 
     function close_dialog_when_user_presses_escape(e) {
       if (e.getSpecialKey() != 'esc') {
         // Some key other than escape.
         return;
       }
 
       if (JX.Workflow._disabled) {
         // Workflows are disabled on this page.
         return;
       }
 
       if (JX.Stratcom.pass()) {
         // Something else swallowed the event.
         return;
       }
 
       var active = JX.Workflow._getActiveWorkflow();
       if (!active) {
         // No active workflow.
         return;
       }
 
       // Note: the cancel button is actually an <a /> tag.
       var buttons = JX.DOM.scry(active._root, 'a', 'jx-workflow-button');
       if (!buttons.length) {
         // No buttons in the dialog.
         return;
       }
 
       var cancel = null;
       for (var ii = 0; ii < buttons.length; ii++) {
         if (buttons[ii].name == '__cancel__') {
           cancel = buttons[ii];
           break;
         }
       }
 
       if (!cancel) {
         // No 'Cancel' button.
         return;
       }
 
       JX.Workflow._pop();
       e.prevent();
     }
 
     JX.Stratcom.listen('keydown', null, close_dialog_when_user_presses_escape);
   }
 
 });
diff --git a/webroot/rsrc/externals/javelin/lib/behavior.js b/webroot/rsrc/externals/javelin/lib/behavior.js
index 8741b9c423..ebd63bb1ac 100644
--- a/webroot/rsrc/externals/javelin/lib/behavior.js
+++ b/webroot/rsrc/externals/javelin/lib/behavior.js
@@ -1,111 +1,109 @@
 /**
  * @provides javelin-behavior
  * @requires javelin-magical-init
  *           javelin-util
  *
  * @javelin-installs JX.behavior
  * @javelin-installs JX.initBehaviors
  *
  * @javelin
  */
 
 /**
  * Define a Javelin behavior, which holds glue code in a structured way. See
  * @{article:Concepts: Behaviors} for a detailed description of Javelin
  * behaviors.
  *
  * To define a behavior, provide a name and a function:
  *
  *   JX.behavior('win-a-hog', function(config, statics) {
  *     alert("YOU WON A HOG NAMED " + config.hogName + "!");
  *   });
  *
  * @param string    Behavior name.
  * @param function  Behavior callback/definition.
  * @return void
- * @group behavior
  */
 JX.behavior = function(name, control_function) {
   if (__DEV__) {
     if (JX.behavior._behaviors.hasOwnProperty(name)) {
       JX.$E(
         'JX.behavior("' + name + '", ...): '+
         'behavior is already registered.');
     }
     if (!control_function) {
       JX.$E(
         'JX.behavior("' + name + '", <nothing>): '+
         'initialization function is required.');
     }
     if (typeof control_function != 'function') {
       JX.$E(
         'JX.behavior("' + name + '", <garbage>): ' +
         'initialization function is not a function.');
     }
     // IE does not enumerate over these properties
     var enumerables = {
       toString: true,
       hasOwnProperty: true,
       valueOf: true,
       isPrototypeOf: true,
       propertyIsEnumerable: true,
       toLocaleString: true,
       constructor: true
     };
     if (enumerables[name]) {
       JX.$E(
         'JX.behavior("' + name + '", <garbage>): ' +
         'do not use this property as a behavior.'
       );
     }
   }
   JX.behavior._behaviors[name] = control_function;
   JX.behavior._statics[name] = {};
 };
 
 
 /**
  * Execute previously defined Javelin behaviors, running the glue code they
  * contain to glue stuff together. See @{article:Concepts: Behaviors} for more
  * information on Javelin behaviors.
  *
  * Normally, you do not call this function yourself; instead, your server-side
  * library builds it for you.
  *
  * @param dict  Map of behaviors to invoke: keys are behavior names, and values
  *              are lists of configuration dictionaries. The behavior will be
  *              invoked once for each configuration dictionary.
  * @return void
- * @group behavior
  */
 JX.initBehaviors = function(map) {
   var missing_behaviors = [];
   for (var name in map) {
     if (!(name in JX.behavior._behaviors)) {
       missing_behaviors.push(name);
       continue;
     }
     var configs = map[name];
     if (!configs.length) {
       if (JX.behavior._initialized.hasOwnProperty(name)) {
         continue;
       }
       configs = [null];
     }
     for (var ii = 0; ii < configs.length; ii++) {
       JX.behavior._behaviors[name](configs[ii], JX.behavior._statics[name]);
     }
     JX.behavior._initialized[name] = true;
   }
   if (missing_behaviors.length) {
     JX.$E(
       'JX.initBehavior(map): behavior(s) not registered: ' +
       missing_behaviors.join(', ')
     );
   }
 };
 
 JX.behavior._behaviors = {};
 JX.behavior._statics = {};
 JX.behavior._initialized = {};
 JX.flushHoldingQueue('behavior', JX.behavior);
diff --git a/webroot/rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js b/webroot/rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js
index 4465f7f91b..4c331e3d25 100644
--- a/webroot/rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js
+++ b/webroot/rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js
@@ -1,438 +1,436 @@
 /**
  * @requires javelin-dom
  *           javelin-util
  *           javelin-stratcom
  *           javelin-install
  * @provides javelin-tokenizer
  * @javelin
  */
 
 /**
  * A tokenizer is a UI component similar to a text input, except that it
  * allows the user to input a list of items ("tokens"), generally from a fixed
  * set of results. A familiar example of this UI is the "To:" field of most
  * email clients, where the control autocompletes addresses from the user's
  * address book.
  *
  * @{JX.Tokenizer} is built on top of @{JX.Typeahead}, and primarily adds the
  * ability to choose multiple items.
  *
  * To build a @{JX.Tokenizer}, you need to do four things:
  *
  *  1. Construct it, padding a DOM node for it to attach to. See the constructor
  *     for more information.
  *  2. Build a {@JX.Typeahead} and configure it with setTypeahead().
  *  3. Configure any special options you want.
  *  4. Call start().
  *
  * If you do this correctly, the input should suggest items and enter them as
  * tokens as the user types.
  *
  * When the tokenizer is focused, the CSS class `jx-tokenizer-container-focused`
  * is added to the container node.
- *
- * @group control
  */
 JX.install('Tokenizer', {
   construct : function(containerNode) {
     this._containerNode = containerNode;
   },
 
   events : [
     /**
      * Emitted when the value of the tokenizer changes, similar to an 'onchange'
      * from a <select />.
      */
     'change'],
 
   properties : {
     limit : null,
     renderTokenCallback : null
   },
 
   members : {
     _containerNode : null,
     _root : null,
     _focus : null,
     _orig : null,
     _typeahead : null,
     _tokenid : 0,
     _tokens : null,
     _tokenMap : null,
     _initialValue : null,
     _seq : 0,
     _lastvalue : null,
     _placeholder : null,
 
     start : function() {
       if (__DEV__) {
         if (!this._typeahead) {
           throw new Error(
             'JX.Tokenizer.start(): ' +
             'No typeahead configured! Use setTypeahead() to provide a ' +
             'typeahead.');
         }
       }
 
       this._orig = JX.DOM.find(this._containerNode, 'input', 'tokenizer-input');
       this._tokens = [];
       this._tokenMap = {};
 
       var focus = this.buildInput(this._orig.value);
       this._focus = focus;
 
       var input_container = JX.DOM.scry(
         this._containerNode,
         'div',
         'tokenizer-input-container'
       );
       input_container = input_container[0] || this._containerNode;
 
       JX.DOM.listen(
         focus,
         ['click', 'focus', 'blur', 'keydown', 'keypress'],
         null,
         JX.bind(this, this.handleEvent));
 
       // NOTE: Safari on the iPhone does not normally delegate click events on
       // <div /> tags. This causes the event to fire. We want a click (in this
       // case, a touch) anywhere in the div to trigger this event so that we
       // can focus the input. Without this, you must tap an arbitrary area on
       // the left side of the input to focus it.
       //
       // http://www.quirksmode.org/blog/archives/2010/09/click_event_del.html
       input_container.onclick = JX.bag;
 
       JX.DOM.listen(
         input_container,
         'click',
         null,
         JX.bind(
           this,
           function(e) {
             if (e.getNode('remove')) {
               this._remove(e.getNodeData('token').key, true);
             } else if (e.getTarget() == this._root) {
               this.focus();
             }
           }));
 
       var root = JX.$N('div');
       root.id = this._orig.id;
       JX.DOM.alterClass(root, 'jx-tokenizer', true);
       root.style.cursor = 'text';
       this._root = root;
 
       root.appendChild(focus);
 
       var typeahead = this._typeahead;
       typeahead.setInputNode(this._focus);
       typeahead.start();
 
       setTimeout(JX.bind(this, function() {
         var container = this._orig.parentNode;
         JX.DOM.setContent(container, root);
         var map = this._initialValue || {};
         for (var k in map) {
           this.addToken(k, map[k]);
         }
         JX.DOM.appendContent(
           root,
           JX.$N('div', {style: {clear: 'both'}})
         );
         this._redraw();
       }), 0);
     },
 
     setInitialValue : function(map) {
       this._initialValue = map;
       return this;
     },
 
     setTypeahead : function(typeahead) {
 
       typeahead.setAllowNullSelection(false);
       typeahead.removeListener();
 
       typeahead.listen(
         'choose',
         JX.bind(this, function(result) {
           JX.Stratcom.context().prevent();
           if (this.addToken(result.rel, result.name)) {
             if (this.shouldHideResultsOnChoose()) {
               this._typeahead.hide();
             }
             this._typeahead.clear();
             this._redraw();
             this.focus();
           }
         })
       );
 
       typeahead.listen(
         'query',
         JX.bind(
           this,
           function(query) {
 
           // TODO: We should emit a 'query' event here to allow the caller to
           // generate tokens on the fly, e.g. email addresses or other freeform
           // or algorithmic tokens.
 
           // Then do this if something handles the event.
           // this._focus.value = '';
           // this._redraw();
           // this.focus();
 
           if (query.length) {
             // Prevent this event if there's any text, so that we don't submit
             // the form (either we created a token or we failed to create a
             // token; in either case we shouldn't submit). If the query is
             // empty, allow the event so that the form submission takes place.
             JX.Stratcom.context().prevent();
           }
         }));
 
       this._typeahead = typeahead;
 
       return this;
     },
 
     shouldHideResultsOnChoose : function() {
       return true;
     },
 
     handleEvent : function(e) {
       this._typeahead.handleEvent(e);
       if (e.getPrevented()) {
         return;
       }
 
       if (e.getType() == 'click') {
         if (e.getTarget() == this._root) {
           this.focus();
           e.prevent();
           return;
         }
       } else if (e.getType() == 'keydown') {
         this._onkeydown(e);
       } else if (e.getType() == 'blur') {
         this._didblur();
 
         // Explicitly update the placeholder since we just wiped the field
         // value.
         this._typeahead.updatePlaceholder();
       } else if (e.getType() == 'focus') {
         this._didfocus();
       }
     },
 
     refresh : function() {
       this._redraw(true);
       return this;
     },
 
     _redraw : function(force) {
 
       // If there are tokens in the tokenizer, never show a placeholder.
       // Otherwise, show one if one is configured.
       if (JX.keys(this._tokenMap).length) {
         this._typeahead.setPlaceholder(null);
       } else {
         this._typeahead.setPlaceholder(this._placeholder);
       }
 
       var focus = this._focus;
 
       if (focus.value === this._lastvalue && !force) {
         return;
       }
       this._lastvalue = focus.value;
 
       var root  = this._root;
       var metrics = JX.DOM.textMetrics(
         this._focus,
         'jx-tokenizer-metrics');
       metrics.y = null;
       metrics.x += 24;
       metrics.setDim(focus);
 
       // NOTE: Once, long ago, we set "focus.value = focus.value;" here to fix
       // an issue with copy/paste in Firefox not redrawing correctly. However,
       // this breaks input of Japanese glyphs in Chrome, and I can't reproduce
       // the original issue in modern Firefox.
       //
       // If future changes muck around with things here, test that Japanese
       // inputs still work. Example:
       //
       //   - Switch to Hiragana mode.
       //   - Type "ni".
       //   - This should produce a glyph, not the value "n".
       //
       // With the assignment, Chrome loses the partial input on the "n" when
       // the value is assigned.
     },
 
     setPlaceholder : function(string) {
       this._placeholder = string;
       return this;
     },
 
     addToken : function(key, value) {
       if (key in this._tokenMap) {
         return false;
       }
 
       var focus = this._focus;
       var root = this._root;
       var token = this.buildToken(key, value);
 
       this._tokenMap[key] = {
         value : value,
         key : key,
         node : token
       };
       this._tokens.push(key);
 
       root.insertBefore(token, focus);
 
       this.invoke('change', this);
 
       return true;
     },
 
     removeToken : function(key) {
       return this._remove(key, false);
     },
 
     buildInput: function(value) {
       return JX.$N('input', {
         className: 'jx-tokenizer-input',
         type: 'text',
         autocomplete: 'off',
         value: value
       });
     },
 
     /**
      * Generate a token based on a key and value. The "token" and "remove"
      * sigils are observed by a listener in start().
      */
     buildToken: function(key, value) {
       var input = JX.$N('input', {
         type: 'hidden',
         value: key,
         name: this._orig.name + '[' + (this._seq++) + ']'
       });
 
       var remove = JX.$N('a', {
         className: 'jx-tokenizer-x',
         sigil: 'remove'
       }, '\u00d7'); // U+00D7 multiplication sign
 
       var display_token = value;
       var render_callback = this.getRenderTokenCallback();
       if (render_callback) {
         display_token = render_callback(value, key);
       }
 
       return JX.$N('a', {
         className: 'jx-tokenizer-token',
         sigil: 'token',
         meta: {key: key}
       }, [display_token, input, remove]);
     },
 
     getTokens : function() {
       var result = {};
       for (var key in this._tokenMap) {
         result[key] = this._tokenMap[key].value;
       }
       return result;
     },
 
     _onkeydown : function(e) {
       var focus = this._focus;
       var root = this._root;
 
       var raw = e.getRawEvent();
       if (raw.ctrlKey || raw.metaKey || raw.altKey) {
         return;
       }
 
       switch (e.getSpecialKey()) {
         case 'tab':
           var completed = this._typeahead.submit();
           if (!completed) {
             this._focus.value = '';
           }
           break;
         case 'delete':
           if (!this._focus.value.length) {
             var tok;
             while ((tok = this._tokens.pop())) {
               if (this._remove(tok, true)) {
                 break;
               }
             }
           }
           break;
         case 'return':
           // Don't subject this to token limits.
           break;
         default:
           if (this.getLimit() &&
               JX.keys(this._tokenMap).length == this.getLimit()) {
             e.prevent();
           }
           setTimeout(JX.bind(this, this._redraw), 0);
           break;
       }
     },
 
     _remove : function(index, focus) {
       if (!this._tokenMap[index]) {
         return false;
       }
       JX.DOM.remove(this._tokenMap[index].node);
       delete this._tokenMap[index];
       this._redraw(true);
       focus && this.focus();
 
       this.invoke('change', this);
 
       return true;
     },
 
     focus : function() {
       var focus = this._focus;
       JX.DOM.show(focus);
 
       // NOTE: We must fire this focus event immediately (during event
       // handling) for the iPhone to bring up the keyboard. Previously this
       // focus was wrapped in setTimeout(), but it's unclear why that was
       // necessary. If this is adjusted later, make sure tapping the inactive
       // area of the tokenizer to focus it on the iPhone still brings up the
       // keyboard.
 
       JX.DOM.focus(focus);
     },
 
     _didfocus : function() {
       JX.DOM.alterClass(
         this._containerNode,
         'jx-tokenizer-container-focused',
         true);
     },
 
     _didblur : function() {
       JX.DOM.alterClass(
         this._containerNode,
         'jx-tokenizer-container-focused',
         false);
       this._focus.value = '';
       this._redraw();
     }
 
   }
 });
diff --git a/webroot/rsrc/externals/javelin/lib/control/typeahead/Typeahead.js b/webroot/rsrc/externals/javelin/lib/control/typeahead/Typeahead.js
index d6d5fbd1ee..5d558efc2b 100644
--- a/webroot/rsrc/externals/javelin/lib/control/typeahead/Typeahead.js
+++ b/webroot/rsrc/externals/javelin/lib/control/typeahead/Typeahead.js
@@ -1,540 +1,539 @@
 /**
  * @requires javelin-install
  *           javelin-dom
  *           javelin-vector
  *           javelin-util
  * @provides javelin-typeahead
  * @javelin
  */
 
 /**
  * A typeahead is a UI component similar to a text input, except that it
  * suggests some set of results (like friends' names, common searches, or
  * repository paths) as the user types them. Familiar examples of this UI
  * include Google Suggest, the Facebook search box, and OS X's Spotlight
  * feature.
  *
  * To build a @{JX.Typeahead}, you need to do four things:
  *
  *  1. Construct it, passing some DOM nodes for it to attach to. See the
  *     constructor for more information.
  *  2. Attach a datasource by calling setDatasource() with a valid datasource,
  *     often a @{JX.TypeaheadPreloadedSource}.
  *  3. Configure any special options that you want.
  *  4. Call start().
  *
  * If you do this correctly, a dropdown menu should appear under the input as
  * the user types, suggesting matching results.
  *
  * @task build        Building a Typeahead
  * @task datasource   Configuring a Datasource
  * @task config       Configuring Options
  * @task start        Activating a Typeahead
  * @task control      Controlling Typeaheads from Javascript
  * @task internal     Internal Methods
- * @group control
  */
 JX.install('Typeahead', {
   /**
    * Construct a new Typeahead on some "hardpoint". At a minimum, the hardpoint
    * should be a ##<div>## with "position: relative;" wrapped around a text
    * ##<input>##. The typeahead's dropdown suggestions will be appended to the
    * hardpoint in the DOM. Basically, this is the bare minimum requirement:
    *
    *   LANG=HTML
    *   <div style="position: relative;">
    *     <input type="text" />
    *   </div>
    *
    * Then get a reference to the ##<div>## and pass it as 'hardpoint', and pass
    * the ##<input>## as 'control'. This will enhance your boring old
    * ##<input />## with amazing typeahead powers.
    *
    * On the Facebook/Tools stack, ##<javelin:typeahead-template />## can build
    * this for you.
    *
    * @param Node  "Hardpoint", basically an anchorpoint in the document which
    *              the typeahead can append its suggestion menu to.
    * @param Node? Actual ##<input />## to use; if not provided, the typeahead
    *              will just look for a (solitary) input inside the hardpoint.
    * @task build
    */
   construct : function(hardpoint, control) {
     this._hardpoint = hardpoint;
     this._control = control || JX.DOM.find(hardpoint, 'input');
 
     this._root = JX.$N(
       'div',
       {className: 'jx-typeahead-results'});
     this._display = [];
 
     this._listener = JX.DOM.listen(
       this._control,
       ['focus', 'blur', 'keypress', 'keydown', 'input'],
       null,
       JX.bind(this, this.handleEvent));
 
     JX.DOM.listen(
       this._root,
       ['mouseover', 'mouseout'],
       null,
       JX.bind(this, this._onmouse));
 
     JX.DOM.listen(
       this._root,
       'mousedown',
       'tag:a',
       JX.bind(this, function(e) {
         if (!e.isRightButton()) {
           this._choose(e.getNode('tag:a'));
         }
       }));
 
   },
 
   events : ['choose', 'query', 'start', 'change', 'show'],
 
   properties : {
 
     /**
      * Boolean. If true (default), the user is permitted to submit the typeahead
      * with a custom or empty selection. This is a good behavior if the
      * typeahead is attached to something like a search input, where the user
      * might type a freeform query or select from a list of suggestions.
      * However, sometimes you require a specific input (e.g., choosing which
      * user owns something), in which case you can prevent null selections.
      *
      * @task config
      */
     allowNullSelection : true
   },
 
   members : {
     _root : null,
     _control : null,
     _hardpoint : null,
     _listener : null,
     _value : null,
     _stop : false,
     _focus : -1,
     _focused : false,
     _placeholderVisible : false,
     _placeholder : null,
     _display : null,
     _datasource : null,
     _waitingListener : null,
     _readyListener : null,
     _completeListener : null,
 
     /**
      * Activate your properly configured typeahead. It won't do anything until
      * you call this method!
      *
      * @task start
      * @return void
      */
     start : function() {
       this.invoke('start');
       if (__DEV__) {
         if (!this._datasource) {
           throw new Error(
             "JX.Typeahead.start(): " +
             "No datasource configured. Create a datasource and call " +
             "setDatasource().");
         }
       }
       this.updatePlaceholder();
     },
 
 
     /**
      * Configure a datasource, which is where the Typeahead gets suggestions
      * from. See @{JX.TypeaheadDatasource} for more information. You must
      * provide exactly one datasource.
      *
      * @task datasource
      * @param JX.TypeaheadDatasource The datasource which the typeahead will
      *                               draw from.
      */
     setDatasource : function(datasource) {
       if (this._datasource) {
         this._datasource.unbindFromTypeahead();
         this._waitingListener.remove();
         this._readyListener.remove();
         this._completeListener.remove();
       }
       this._waitingListener = datasource.listen(
         'waiting',
         JX.bind(this, this.waitForResults));
 
       this._readyListener = datasource.listen(
         'resultsready',
         JX.bind(this, this.showResults));
 
       this._completeListener = datasource.listen(
         'complete',
         JX.bind(this, this.doneWaitingForResults));
 
       datasource.bindToTypeahead(this);
       this._datasource = datasource;
     },
 
     getDatasource : function() {
       return this._datasource;
     },
 
     /**
      * Override the <input /> selected in the constructor with some other input.
      * This is primarily useful when building a control on top of the typeahead,
      * like @{JX.Tokenizer}.
      *
      * @task config
      * @param node An <input /> node to use as the primary control.
      */
     setInputNode : function(input) {
       this._control = input;
       return this;
     },
 
 
     /**
      * Hide the typeahead's dropdown suggestion menu.
      *
      * @task control
      * @return void
      */
     hide : function() {
       this._changeFocus(Number.NEGATIVE_INFINITY);
       this._display = [];
       this._moused = false;
       JX.DOM.hide(this._root);
     },
 
 
     /**
      * Show a given result set in the typeahead's dropdown suggestion menu.
      * Normally, you don't call this method directly. Usually it gets called
      * in response to events from the datasource you have configured.
      *
      * @task   control
      * @param  list     List of ##<a />## tags to show as suggestions/results.
      * @param  string   The query this result list corresponds to.
      * @return void
      */
     showResults : function(results, value) {
       if (value != this._value) {
         // This result list is for an old query, and no longer represents
         // the input state of the typeahead.
 
         // For example, the user may have typed "dog", and then they delete
         // their query and type "cat", and then the "dog" results arrive from
         // the source.
 
         // Another case is that the user made a selection in a tokenizer,
         // and then results returned. However, the typeahead is now empty, and
         // we don't want to pop it back open.
 
         // In all cases, just throw these results away. They are no longer
         // relevant.
         return;
       }
 
       var obj = {show: results};
       var e = this.invoke('show', obj);
 
       // Note that the results list may have been update by the "show" event
       // listener. Non-result node (e.g. divider or label) may have been
       // inserted.
       JX.DOM.setContent(this._root, results);
       this._display = JX.DOM.scry(this._root, 'a', 'typeahead-result');
 
       if (this._display.length && !e.getPrevented()) {
         this._changeFocus(Number.NEGATIVE_INFINITY);
         var d = JX.Vector.getDim(this._hardpoint);
         d.x = 0;
         d.setPos(this._root);
         if (this._root.parentNode !== this._hardpoint) {
           this._hardpoint.appendChild(this._root);
         }
         JX.DOM.show(this._root);
       } else {
         this.hide();
         JX.DOM.setContent(this._root, null);
       }
     },
 
     refresh : function() {
       if (this._stop) {
         return;
       }
 
       this._value = this._control.value;
       this.invoke('change', this._value);
     },
 
     /**
      * Show a "waiting for results" UI. We may be showing a partial result set
      * at this time, if the user is extending a query we already have results
      * for.
      *
      * @task control
      * @return void
      */
     waitForResults : function() {
       JX.DOM.alterClass(this._hardpoint, 'jx-typeahead-waiting', true);
     },
 
     /**
      * Hide the "waiting for results" UI.
      *
      * @task control
      * @return void
      */
     doneWaitingForResults : function() {
       JX.DOM.alterClass(this._hardpoint, 'jx-typeahead-waiting', false);
     },
 
     /**
      * @task internal
      */
     _onmouse : function(event) {
       this._moused = (event.getType() == 'mouseover');
       this._drawFocus();
     },
 
 
     /**
      * @task internal
      */
     _changeFocus : function(d) {
       var n = Math.min(Math.max(-1, this._focus + d), this._display.length - 1);
       if (!this.getAllowNullSelection()) {
         n = Math.max(0, n);
       }
       if (this._focus >= 0 && this._focus < this._display.length) {
         JX.DOM.alterClass(this._display[this._focus], 'focused', false);
       }
       this._focus = n;
       this._drawFocus();
       return true;
     },
 
 
     /**
      * @task internal
      */
     _drawFocus : function() {
       var f = this._display[this._focus];
       if (f) {
         JX.DOM.alterClass(f, 'focused', !this._moused);
       }
     },
 
 
     /**
      * @task internal
      */
     _choose : function(target) {
       var result = this.invoke('choose', target);
       if (result.getPrevented()) {
         return;
       }
 
       this._control.value = target.name;
       this.hide();
     },
 
 
     /**
      * @task control
      */
     clear : function() {
       this._control.value = '';
       this._value = '';
       this.hide();
     },
 
 
     /**
      * @task control
      */
     enable : function() {
       this._control.disabled = false;
       this._stop = false;
     },
 
 
     /**
      * @task control
      */
     disable : function() {
       this._control.blur();
       this._control.disabled = true;
       this._stop = true;
     },
 
 
     /**
      * @task control
      */
     submit : function() {
       if (this._focus >= 0 && this._display[this._focus]) {
         this._choose(this._display[this._focus]);
         return true;
       } else {
         result = this.invoke('query', this._control.value);
         if (result.getPrevented()) {
           return true;
         }
       }
       return false;
     },
 
     setValue : function(value) {
       this._control.value = value;
     },
 
     getValue : function() {
       return this._control.value;
     },
 
     /**
      * @task internal
      */
     _update : function(event) {
 
       if (event.getType() == 'focus') {
         this._focused = true;
         this.updatePlaceholder();
       }
 
       var k = event.getSpecialKey();
       if (k && event.getType() == 'keydown') {
         switch (k) {
           case 'up':
             if (this._display.length && this._changeFocus(-1)) {
               event.prevent();
             }
             break;
           case 'down':
             if (this._display.length && this._changeFocus(1)) {
               event.prevent();
             }
             break;
           case 'return':
             if (this.submit()) {
               event.prevent();
               return;
             }
             break;
           case 'esc':
             if (this._display.length && this.getAllowNullSelection()) {
               this.hide();
               event.prevent();
             }
             break;
           case 'tab':
             // If the user tabs out of the field, don't refresh.
             return;
         }
       }
 
       // We need to defer because the keystroke won't be present in the input's
       // value field yet.
       setTimeout(JX.bind(this, function() {
         if (this._value == this._control.value) {
           // The typeahead value hasn't changed.
           return;
         }
         this.refresh();
       }), 0);
     },
 
     /**
      * This method is pretty much internal but @{JX.Tokenizer} needs access to
      * it for delegation. You might also need to delegate events here if you
      * build some kind of meta-control.
      *
      * Reacts to user events in accordance to configuration.
      *
      * @task internal
      * @param JX.Event User event, like a click or keypress.
      * @return void
      */
     handleEvent : function(e) {
       if (this._stop || e.getPrevented()) {
         return;
       }
       var type = e.getType();
       if (type == 'blur') {
         this._focused = false;
         this.updatePlaceholder();
         this.hide();
       } else {
         this._update(e);
       }
     },
 
     removeListener : function() {
       if (this._listener) {
         this._listener.remove();
       }
     },
 
 
     /**
      * Set a string to display in the control when it is not focused, like
      * "Type a user's name...". This string hints to the user how to use the
      * control.
      *
      * When the string is displayed, the input will have class
      * "jx-typeahead-placeholder".
      *
      * @param string Placeholder string, or null for no placeholder.
      * @return this
      *
      * @task config
      */
     setPlaceholder : function(string) {
       this._placeholder = string;
       this.updatePlaceholder();
       return this;
     },
 
 
     /**
      * Update the control to either show or hide the placeholder text as
      * necessary.
      *
      * @return void
      * @task internal
      */
     updatePlaceholder : function() {
 
       if (this._placeholderVisible) {
         // If the placeholder is visible, we want to hide if the control has
         // been focused or the placeholder has been removed.
         if (this._focused || !this._placeholder) {
           this._placeholderVisible = false;
           this._control.value = '';
         }
       } else if (!this._focused) {
         // If the placeholder is not visible, we want to show it if the control
         // has benen blurred.
         if (this._placeholder && !this._control.value) {
           this._placeholderVisible = true;
         }
       }
 
       if (this._placeholderVisible) {
         // We need to resist the Tokenizer wiping the input on blur.
         this._control.value = this._placeholder;
       }
 
       JX.DOM.alterClass(
         this._control,
         'jx-typeahead-placeholder',
         this._placeholderVisible);
     }
   }
 });
diff --git a/webroot/rsrc/externals/javelin/lib/control/typeahead/normalizer/TypeaheadNormalizer.js b/webroot/rsrc/externals/javelin/lib/control/typeahead/normalizer/TypeaheadNormalizer.js
index 0410f75840..5611ea6252 100644
--- a/webroot/rsrc/externals/javelin/lib/control/typeahead/normalizer/TypeaheadNormalizer.js
+++ b/webroot/rsrc/externals/javelin/lib/control/typeahead/normalizer/TypeaheadNormalizer.js
@@ -1,27 +1,24 @@
 /**
  * @requires javelin-install
  * @provides javelin-typeahead-normalizer
  * @javelin
  */
 
-/**
- * @group control
- */
 JX.install('TypeaheadNormalizer', {
   statics : {
     /**
      * Normalizes a string by lowercasing it and stripping out extra spaces
      * and punctuation.
      *
      * @param string
      * @return string Normalized string.
      */
     normalize : function(str) {
       return ('' + str)
         .toLocaleLowerCase()
         .replace(/[\.,-\/#!$%\^&\*;:{}=\-_`~()]/g, '')
         .replace(/ +/g, ' ')
         .replace(/^\s*|\s*$/g, '');
     }
   }
 });
diff --git a/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadCompositeSource.js b/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadCompositeSource.js
index aa5fb16d36..7f1d80e86e 100644
--- a/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadCompositeSource.js
+++ b/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadCompositeSource.js
@@ -1,77 +1,74 @@
 /**
  * @requires javelin-install
  *           javelin-typeahead-source
  *           javelin-util
  * @provides javelin-typeahead-composite-source
  * @javelin
  */
 
-/**
- * @group control
- */
 JX.install('TypeaheadCompositeSource', {
 
   extend : 'TypeaheadSource',
 
   construct : function(sources) {
     JX.TypeaheadSource.call(this);
     this.sources = sources;
 
     for (var ii = 0; ii < this.sources.length; ++ii) {
       var child = this.sources[ii];
       child.listen('waiting', JX.bind(this, this.childWaiting));
       child.listen('resultsready', JX.bind(this, this.childResultsReady));
       child.listen('complete', JX.bind(this, this.childComplete));
     }
   },
 
   members : {
     sources : null,
     results : null,
     completeCount : 0,
 
     didChange : function(value) {
       this.results = [];
       this.completeCount = 0;
       for (var ii = 0; ii < this.sources.length; ++ii) {
         this.sources[ii].didChange(value);
       }
     },
 
     didStart : function() {
       for (var ii = 0; ii < this.sources.length; ++ii) {
         this.sources[ii].didStart();
       }
     },
 
     childWaiting : function() {
       if (!this.results || !this.results.length) {
         this.invoke('waiting');
       }
     },
 
     childResultsReady : function(nodes, value) {
       this.results = this.mergeResults(this.results || [], nodes);
       this.invoke('resultsready', this.results, value);
     },
 
     childComplete : function() {
       this.completeCount++;
       if (this.completeCount == this.sources.length) {
         this.invoke('complete');
       }
     },
 
     /**
      * Overrideable strategy for combining results.
      * By default, appends results as they come in
      * so that results don't jump around.
      */
     mergeResults : function(oldResults, newResults) {
       for (var ii = 0; ii < newResults.length; ++ii) {
         oldResults.push(newResults[ii]);
       }
       return oldResults;
     }
   }
 });
diff --git a/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadOnDemandSource.js b/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadOnDemandSource.js
index 626d43378a..fd601478a0 100644
--- a/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadOnDemandSource.js
+++ b/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadOnDemandSource.js
@@ -1,101 +1,98 @@
 /**
  * @requires javelin-install
  *           javelin-util
  *           javelin-request
  *           javelin-typeahead-source
  * @provides javelin-typeahead-ondemand-source
  * @javelin
  */
 
-/**
- * @group control
- */
 JX.install('TypeaheadOnDemandSource', {
 
   extend : 'TypeaheadSource',
 
   construct : function(uri) {
     JX.TypeaheadSource.call(this);
     this.uri = uri;
     this.haveData = {
       '' : true
     };
   },
 
   properties : {
     /**
      * Configures how many milliseconds we wait after the user stops typing to
      * send a request to the server. Setting a value of 250 means "wait 250
      * milliseconds after the user stops typing to request typeahead data".
      * Higher values reduce server load but make the typeahead less responsive.
      */
     queryDelay : 125,
     /**
      * Auxiliary data to pass along when sending the query for server results.
      */
     auxiliaryData : {}
   },
 
   members : {
     uri : null,
     lastChange : null,
     haveData : null,
 
     didChange : function(raw_value) {
       this.lastChange = JX.now();
       var value = this.normalize(raw_value);
 
       if (this.haveData[value]) {
         this.matchResults(raw_value);
       } else {
         // If we have data for any prefix of the query, send those results
         // back immediately. This allows "alinc" -> "alinco" to show partial
         // results without the UI flickering. We'll still show the loading
         // state, and then can show better results once we get everything
         // back.
         for (var ii = value.length - 1; ii > 0; ii--) {
           var substr = value.substring(0, ii);
           if (this.haveData[substr]) {
             this.matchResults(raw_value, true);
             break;
           }
         }
 
         this.waitForResults();
         setTimeout(
           JX.bind(this, this.sendRequest, this.lastChange, value, raw_value),
           this.getQueryDelay()
         );
       }
     },
 
     sendRequest : function(when, value, raw_value) {
       if (when != this.lastChange) {
         return;
       }
       var r = new JX.Request(
         this.uri,
         JX.bind(this, this.ondata, this.lastChange, raw_value));
       r.setMethod('GET');
       r.setData(JX.copy(this.getAuxiliaryData(), {q : value, raw: raw_value}));
       r.send();
     },
 
     ondata : function(when, raw_value, results) {
       if (results) {
         for (var ii = 0; ii < results.length; ii++) {
           this.addResult(results[ii]);
         }
       }
 
       var value = this.normalize(raw_value);
       this.haveData[value] = true;
 
       if (when != this.lastChange) {
         return;
       }
 
       this.matchResults(raw_value);
     }
   }
 });
diff --git a/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadPreloadedSource.js b/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadPreloadedSource.js
index 6324bf8070..074d552892 100644
--- a/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadPreloadedSource.js
+++ b/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadPreloadedSource.js
@@ -1,62 +1,60 @@
 /**
  * @requires javelin-install
  *           javelin-util
  *           javelin-request
  *           javelin-typeahead-source
  * @provides javelin-typeahead-preloaded-source
  * @javelin
  */
 
 /**
  * Simple datasource that loads all possible results from a single call to a
  * URI. This is appropriate if the total data size is small (up to perhaps a
  * few thousand items). If you have more items so you can't ship them down to
  * the client in one repsonse, use @{JX.TypeaheadOnDemandSource}.
- *
- * @group control
  */
 JX.install('TypeaheadPreloadedSource', {
 
   extend : 'TypeaheadSource',
 
   construct : function(uri) {
     JX.TypeaheadSource.call(this);
     this.uri = uri;
   },
 
   members : {
 
     ready : false,
     uri : null,
     lastValue : null,
 
     didChange : function(value) {
       if (this.ready) {
         this.matchResults(value);
       } else {
         this.lastValue = value;
         this.waitForResults();
       }
     },
 
     didStart : function() {
       var r = new JX.Request(this.uri, JX.bind(this, this.ondata));
       r.setMethod('GET');
       r.send();
     },
 
     ondata : function(results) {
       for (var ii = 0; ii < results.length; ++ii) {
         this.addResult(results[ii]);
       }
       if (this.lastValue !== null) {
         this.matchResults(this.lastValue);
       }
       this.ready = true;
     },
 
     setReady: function(ready) {
       this.ready = ready;
     }
   }
 });
diff --git a/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js b/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js
index 5947ffef88..909a994e0c 100644
--- a/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js
+++ b/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js
@@ -1,374 +1,371 @@
 /**
  * @requires javelin-install
  *           javelin-util
  *           javelin-dom
  *           javelin-typeahead-normalizer
  * @provides javelin-typeahead-source
  * @javelin
  */
 
-/**
- * @group control
- */
 JX.install('TypeaheadSource', {
   construct : function() {
     this._raw = {};
     this._lookup = {};
     this.setNormalizer(JX.TypeaheadNormalizer.normalize);
     this._excludeIDs = {};
   },
 
   events : ['waiting', 'resultsready', 'complete'],
 
   properties : {
 
     /**
      * Allows you to specify a function which will be used to normalize strings.
      * Strings are normalized before being tokenized, and before being sent to
      * the server. The purpose of normalization is to strip out irrelevant data,
      * like uppercase/lowercase, extra spaces, or punctuation. By default,
      * the @{JX.TypeaheadNormalizer} is used to normalize strings, but you may
      * want to provide a different normalizer, particiularly if there are
      * special characters with semantic meaning in your object names.
      *
      * @param function
      */
     normalizer : null,
 
     /**
      * If a typeahead query should be processed before being normalized and
      * tokenized, specify a queryExtractor.
      *
      * @param function
      */
     queryExtractor : null,
 
     /**
      * Transformers convert data from a wire format to a runtime format. The
      * transformation mechanism allows you to choose an efficient wire format
      * and then expand it on the client side, rather than duplicating data
      * over the wire. The transformation is applied to objects passed to
      * addResult(). It should accept whatever sort of object you ship over the
      * wire, and produce a dictionary with these keys:
      *
      *    - **id**: a unique id for each object.
      *    - **name**: the string used for matching against user input.
      *    - **uri**: the URI corresponding with the object (must be present
      *      but need not be meaningful)
      *
      * You can also give:
      *    - **display**: the text or nodes to show in the DOM. Usually just the
      *      same as ##name##.
      *    - **tokenizable**: if you want to tokenize something other than the
-     *      ##name##, for the typeahead to complete on, specify it here.  A
+     *      ##name##, for the typeahead to complete on, specify it here. A
      *      selected entry from the typeahead will still insert the ##name##
      *      into the input, but the ##tokenizable## field lets you complete on
      *      non-name things.
      *
      * The default transformer expects a three element list with elements
      * [name, uri, id]. It assigns the first element to both ##name## and
      * ##display##.
      *
      * @param function
      */
     transformer : null,
 
     /**
      * Configures the maximum number of suggestions shown in the typeahead
      * dropdown.
      *
      * @param int
      */
     maximumResultCount : 5,
 
     /**
      * Optional function which is used to sort results. Inputs are the input
      * string, the list of matches, and a default comparator. The function
      * should sort the list for display. This is the minimum useful
      * implementation:
      *
      *   function(value, list, comparator) {
      *     list.sort(comparator);
      *   }
      *
      * Alternatively, you may pursue more creative implementations.
      *
      * The `value` is a raw string; you can bind the datasource into the
      * function and use normalize() or tokenize() to parse it.
      *
      * The `list` is a list of objects returned from the transformer function,
      * see the `transformer` property. These are the objects in the list which
      * match the value.
      *
      * The `comparator` is a sort callback which implements sensible default
      * sorting rules (e.g., alphabetic order), which you can use as a fallback
      * if you just want to tweak the results (e.g., put some items at the top).
      *
      * The function is called after the user types some text, immediately before
      * the possible completion results are displayed to the user.
      *
      * @param function
      */
     sortHandler : null,
 
     /**
      * Optional function which is used to filter results before display. Inputs
      * are the input string and a list of matches. The function should
      * return a list of matches to display. This is the minimum useful
      * implementation:
      *
      *   function(value, list) {
      *     return list;
      *   }
      *
      * @param function
      */
     filterHandler : null
 
   },
 
   members : {
     _raw : null,
     _lookup : null,
     _excludeIDs : null,
     _changeListener : null,
     _startListener : null,
 
     bindToTypeahead : function(typeahead) {
       this._changeListener = typeahead.listen(
         'change',
         JX.bind(this, this.didChange)
       );
       this._startListener = typeahead.listen(
         'start',
         JX.bind(this, this.didStart)
       );
     },
 
     unbindFromTypeahead : function() {
       this._changeListener.remove();
       this._startListener.remove();
     },
 
     didChange : function(value) {
       return;
     },
 
     didStart : function() {
       return;
     },
 
     clearCache : function() {
       this._raw = {};
       this._lookup = {};
     },
 
     addExcludeID : function(id) {
       if (id) {
         this._excludeIDs[id] = true;
       }
     },
 
     removeExcludeID : function (id) {
       if (id) {
         delete this._excludeIDs[id];
       }
     },
 
     addResult : function(obj) {
       obj = (this.getTransformer() || this._defaultTransformer)(obj);
 
       if (obj.id in this._raw) {
         // We're already aware of this result. This will happen if someone
         // searches for "zeb" and then for "zebra" with a
         // TypeaheadRequestSource, for example, or the datasource just doesn't
         // dedupe things properly. Whatever the case, just ignore it.
         return;
       }
 
       if (__DEV__) {
         for (var k in {name : 1, id : 1, display : 1, uri : 1}) {
           if (!(k in obj)) {
             throw new Error(
               "JX.TypeaheadSource.addResult(): " +
               "result must have properties 'name', 'id', 'uri' and 'display'.");
           }
         }
       }
 
       this._raw[obj.id] = obj;
       var t = this.tokenize(obj.tokenizable || obj.name);
       for (var jj = 0; jj < t.length; ++jj) {
         if (!this._lookup.hasOwnProperty(t[jj])) {
           this._lookup[t[jj]] = [];
         }
         this._lookup[t[jj]].push(obj.id);
       }
     },
 
     waitForResults : function() {
       this.invoke('waiting');
       return this;
     },
 
 
     /**
      * Get the raw state of a result by its ID. A number of other events and
      * mechanisms give a list of result IDs and limited additional data; if you
      * need to act on the full result data you can look it up here.
      *
      * @param scalar Result ID.
      * @return dict Corresponding raw result.
      */
     getResult : function(id) {
       return this._raw[id];
     },
 
 
     matchResults : function(value, partial) {
 
       // This table keeps track of the number of tokens each potential match
       // has actually matched. When we're done, the real matches are those
       // which have matched every token (so the value is equal to the token
       // list length).
       var match_count = {};
 
       // This keeps track of distinct matches. If the user searches for
       // something like "Chris C" against "Chris Cox", the "C" will match
       // both fragments. We need to make sure we only count distinct matches.
       var match_fragments = {};
 
       var matched = {};
       var seen = {};
 
       var query_extractor = this.getQueryExtractor();
       if (query_extractor) {
         value = query_extractor(value);
       }
       var t = this.tokenize(value);
 
       // Sort tokens by longest-first. We match each name fragment with at
       // most one token.
       t.sort(function(u, v) { return v.length - u.length; });
 
       for (var ii = 0; ii < t.length; ++ii) {
         // Do something reasonable if the user types the same token twice; this
         // is sort of stupid so maybe kill it?
         if (t[ii] in seen) {
           t.splice(ii--, 1);
           continue;
         }
         seen[t[ii]] = true;
         var fragment = t[ii];
         for (var name_fragment in this._lookup) {
           if (name_fragment.substr(0, fragment.length) === fragment) {
             if (!(name_fragment in matched)) {
               matched[name_fragment] = true;
             } else {
               continue;
             }
             var l = this._lookup[name_fragment];
             for (var jj = 0; jj < l.length; ++jj) {
               var match_id = l[jj];
               if (!match_fragments[match_id]) {
                 match_fragments[match_id] = {};
               }
               if (!(fragment in match_fragments[match_id])) {
                 match_fragments[match_id][fragment] = true;
                 match_count[match_id] = (match_count[match_id] || 0) + 1;
               }
             }
           }
         }
       }
 
       var hits = [];
       for (var k in match_count) {
         if (match_count[k] == t.length && !this._excludeIDs[k]) {
           hits.push(k);
         }
       }
 
       this.filterAndSortHits(value, hits);
 
       var nodes = this.renderNodes(value, hits);
       this.invoke('resultsready', nodes, value);
       if (!partial) {
         this.invoke('complete');
       }
     },
 
     filterAndSortHits : function(value, hits) {
       var objs = [];
       var ii;
       for (ii = 0; ii < hits.length; ii++) {
         objs.push(this._raw[hits[ii]]);
       }
 
       var default_comparator = function(u, v) {
          var key_u = u.sort || u.name;
          var key_v = v.sort || v.name;
          return key_u.localeCompare(key_v);
       };
 
       var filter_handler = this.getFilterHandler() || function(value, list) {
         return list;
       };
 
       objs = filter_handler(value, objs);
 
       var sort_handler = this.getSortHandler() || function(value, list, cmp) {
         list.sort(cmp);
       };
 
       sort_handler(value, objs, default_comparator);
 
       hits.splice(0, hits.length);
       for (ii = 0; ii < objs.length; ii++) {
         hits.push(objs[ii].id);
       }
     },
 
     renderNodes : function(value, hits) {
       var n = Math.min(this.getMaximumResultCount(), hits.length);
       var nodes = [];
       for (var kk = 0; kk < n; kk++) {
         nodes.push(this.createNode(this._raw[hits[kk]]));
       }
       return nodes;
     },
 
     createNode : function(data) {
       return JX.$N(
         'a',
         {
           sigil: 'typeahead-result',
           href: data.uri,
           name: data.name,
           rel: data.id,
           className: 'jx-result'
         },
         data.display
       );
     },
 
     normalize : function(str) {
       return this.getNormalizer()(str);
     },
     tokenize : function(str) {
       str = this.normalize(str);
       if (!str.length) {
         return [];
       }
       return str.split(/\s/g);
     },
     _defaultTransformer : function(object) {
       return {
         name : object[0],
         display : object[0],
         uri : object[1],
         id : object[2]
       };
     }
   }
 });
diff --git a/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadStaticSource.js b/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadStaticSource.js
index 39705f4dcd..765074ff27 100644
--- a/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadStaticSource.js
+++ b/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadStaticSource.js
@@ -1,37 +1,35 @@
 /**
  * @requires javelin-install
  *           javelin-typeahead-source
  * @provides javelin-typeahead-static-source
  * @javelin
  */
 
 /**
  * Typeahead source that uses static data passed to the constructor. For larger
  * datasets, use @{class:JX.TypeaheadPreloadedSource} or
  * @{class:JX.TypeaheadOnDemandSource} to improve performance.
- *
- * @group control
  */
 JX.install('TypeaheadStaticSource', {
 
   extend : 'TypeaheadSource',
 
   construct : function(data) {
     JX.TypeaheadSource.call(this);
     this._data = data;
   },
 
   members : {
     _data : null,
 
     didChange : function(value) {
       this.matchResults(value);
     },
 
     didStart : function() {
       for (var ii = 0; ii < this._data.length; ii++) {
         this.addResult(this._data[ii]);
       }
     }
   }
 });
diff --git a/webroot/rsrc/js/application/releeph/releeph-request-typeahead.js b/webroot/rsrc/js/application/releeph/releeph-request-typeahead.js
index d8b8db7321..43f9366311 100644
--- a/webroot/rsrc/js/application/releeph/releeph-request-typeahead.js
+++ b/webroot/rsrc/js/application/releeph/releeph-request-typeahead.js
@@ -1,79 +1,79 @@
 /**
  * @provides javelin-behavior-releeph-request-typeahead
  * @requires javelin-behavior
  *           javelin-dom
  *           javelin-typeahead
  *           javelin-typeahead-ondemand-source
  *           javelin-dom
  */
 
 JX.behavior('releeph-request-typeahead', function(config) {
   var root = JX.$(config.id);
   var datasource = new JX.TypeaheadOnDemandSource(config.src);
   var callsign = config.aux.callsign;
 
   datasource.setAuxiliaryData(config.aux);
 
   datasource.setTransformer(
     function(object) {
       var full_commit_id = object[0];
       var short_commit_id = object[1];
       var author = object[2];
       var ago = object[3];
       var summary = object[4];
 
       var callsign_commit_id = 'r' + callsign + short_commit_id;
 
       var box =
         JX.$N(
           'div',
           {},
           [
             JX.$N(
               'div',
               { className: 'commit-id' },
               callsign_commit_id
             ),
             JX.$N(
               'div',
               { className: 'author-info' },
               ago + ' ago by ' + author
             ),
             JX.$N(
               'div',
               { className: 'summary' },
               summary
             )
           ]
         );
 
       return {
         name: callsign_commit_id,
         tokenizable: callsign_commit_id + ' '+ short_commit_id + ' ' + summary,
         display: box,
         uri: null,
         id: full_commit_id
       };
     });
 
   /**
    * The default normalizer removes useful control characters that would help
-   * out search.  For example, I was just trying to search for a commit with
+   * out search. For example, I was just trying to search for a commit with
    * the string "a_file" in the message, which was normalized to "afile".
    */
   datasource.setNormalizer(function(query) {
     return query;
   });
 
   datasource.setMaximumResultCount(config.aux.limit);
 
   var typeahead = new JX.Typeahead(root);
   typeahead.setDatasource(datasource);
 
   var placeholder = config.value || config.placeholder;
   if (placeholder) {
     typeahead.setPlaceholder(placeholder);
   }
 
   typeahead.start();
 });
diff --git a/webroot/rsrc/js/core/behavior-toggle-class.js b/webroot/rsrc/js/core/behavior-toggle-class.js
index ce55deb3dc..2e21ed9716 100644
--- a/webroot/rsrc/js/core/behavior-toggle-class.js
+++ b/webroot/rsrc/js/core/behavior-toggle-class.js
@@ -1,32 +1,30 @@
 /**
  * @provides javelin-behavior-toggle-class
  * @requires javelin-behavior
  *           javelin-stratcom
  *           javelin-dom
  */
 
 /**
  * Toggle CSS classes when an element is clicked. This behavior is activated
  * by adding the sigil `jx-toggle-class` to an element, and a key `map` to its
  * data. The `map` should be a map from element IDs to the classes that should
  * be toggled on them.
  *
  * Optionally, you may provide a `state` key to set the default state of the
  * element.
- *
- * @group ui
  */
 JX.behavior('toggle-class', function() {
   JX.Stratcom.listen(
     ['touchstart', 'mousedown'],
     'jx-toggle-class',
     function(e) {
       e.kill();
 
       var t = e.getNodeData('jx-toggle-class');
       t.state = !t.state;
       for (var k in t.map) {
         JX.DOM.alterClass(JX.$(k), t.map[k], t.state);
       }
     });
 });