Tweaked code style issues.