Coding standards cleanup.

https://drupal.org/node/2178501