--- a/browser/base/content/browser-fullZoom.js
+++ b/browser/base/content/browser-fullZoom.js
@@ -23,26 +23,24 @@ var FullZoom = {
   // Stores initial locations if we receive onLocationChange
   // events before we're initialized.
   _initialLocations: new WeakMap(),
 
   get siteSpecific() {
     return this._siteSpecificPref;
   },
 
-  //* *************************************************************************//
   // nsISupports
 
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIDOMEventListener,
                                          Ci.nsIObserver,
                                          Ci.nsIContentPrefObserver,
                                          Ci.nsISupportsWeakReference,
                                          Ci.nsISupports]),
 
-  //* *************************************************************************//
   // Initialization & Destruction
 
   init: function FullZoom_init() {
     gBrowser.addEventListener("ZoomChangeUsingMouseWheel", this);
 
     // Register ourselves with the service so we know when our pref changes.
     this._cps2 = Cc["@mozilla.org/content-pref/service;1"].
                  getService(Ci.nsIContentPrefService2);
@@ -70,17 +68,16 @@ var FullZoom = {
 
   destroy: function FullZoom_destroy() {
     gPrefService.removeObserver("browser.zoom.", this);
     this._cps2.removeObserverForName(this.name, this);
     gBrowser.removeEventListener("ZoomChangeUsingMouseWheel", this);
   },
 
 
-  //* *************************************************************************//
   // Event Handlers
 
   // nsIDOMEventListener
 
   handleEvent: function FullZoom_handleEvent(event) {
     switch (event.type) {
       case "ZoomChangeUsingMouseWheel":
         let browser = this._getTargetedBrowser(event);
@@ -241,17 +238,16 @@ var FullZoom = {
   // update state of zoom type menu item
 
   updateMenu: function FullZoom_updateMenu() {
     var menuItem = document.getElementById("toggle_zoom");
 
     menuItem.setAttribute("checked", !ZoomManager.useFullZoom);
   },
 
-  //* *************************************************************************//
   // Setting & Pref Manipulation
 
   /**
    * Reduces the zoom level of the page in the current browser.
    */
   reduce: function FullZoom_reduce() {
     ZoomManager.reduce();
     let browser = gBrowser.selectedBrowser;
@@ -386,17 +382,16 @@ var FullZoom = {
     let ctxt = this._loadContextFromBrowser(browser);
     this._cps2.removeByDomainAndName(browser.currentURI.spec, this.name, ctxt, {
       handleCompletion: function () {
         this._isNextContentPrefChangeInternal = true;
       }.bind(this),
     });
   },
 
-  //* *************************************************************************//
   // Utilities
 
   /**
    * Returns the zoom change token of the given browser.  Asynchronous
    * operations that access the given browser's zoom should use this method to
    * capture the token before starting and use token.isCurrent to determine if
    * it's safe to access the zoom when done.  If token.isCurrent is false, then
    * after the async operation started, either the browser's zoom was changed or

--- a/browser/base/content/content.js
+++ b/browser/base/content/content.js
@@ -1298,17 +1298,17 @@ var PageInfoListener = {
       result.SVGImageElementHeight = item.height.baseVal.value;
     }
 
     result.baseURI = item.baseURI;
 
     return result;
   },
 
-  //* ******* Other Misc Stuff
+  // Other Misc Stuff
   // Modified from the Links Panel v2.3, http://segment7.net/mozilla/links/links.html
   // parse a node to extract the contents of the node
   getValueText: function(node)
   {
 
     let valueText = "";
 
     // Form input elements don't generally contain information that is useful to our callers, so return nothing.

--- a/browser/base/content/pageinfo/pageInfo.js
+++ b/browser/base/content/pageinfo/pageInfo.js
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Components.utils.import("resource://gre/modules/LoadContextInfo.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");
 
-//* ******* define a js object to implement nsITreeView
+// define a js object to implement nsITreeView
 function pageInfoTreeView(treeid, copycol)
 {
   // copycol is the index number for the column that we want to add to
   // the copy-n-paste buffer when the user hits accel-c
   this.treeid = treeid;
   this.copycol = copycol;
   this.rows = 0;
   this.tree = null;
@@ -631,17 +631,17 @@ function addImage(imageViewRow)
         gImageElement.width == elem.width &&
         gImageElement.height == elem.height &&
         gImageElement.imageText == elem.imageText) {
       gImageView.data[i][COL_IMAGE_NODE] = elem;
     }
   }
 }
 
-//* ******* Link Stuff
+// Link Stuff
 function openURL(target)
 {
   var url = target.parentNode.childNodes[2].value;
   window.open(url, "_blank", "chrome");
 }
 
 function onBeginLinkDrag(event, urlField, descField)
 {
@@ -663,17 +663,17 @@ function onBeginLinkDrag(event, urlField
   var desc = tree.view.getCellText(row, col);
 
   var dt = event.dataTransfer;
   dt.setData("text/x-moz-url", url + "\n" + desc);
   dt.setData("text/url-list", url);
   dt.setData("text/plain", url);
 }
 
-//* ******* Image Stuff
+// Image Stuff
 function getSelectedRows(tree)
 {
   var start = { };
   var end   = { };
   var numRanges = tree.view.selection.getRangeCount();
 
   var rowArray = [ ];
   for (var t = 0; t < numRanges; t++) {

--- a/browser/components/preferences/in-content/applications.js
+++ b/browser/components/preferences/in-content/applications.js
@@ -1,15 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
-//* ***************************************************************************//
 // Constants & Enumeration Values
 
 Components.utils.import('resource://gre/modules/Services.jsm');
 Components.utils.import('resource://gre/modules/AppConstants.jsm');
 const TYPE_MAYBE_FEED = "application/vnd.mozilla.maybe.feed";
 const TYPE_MAYBE_VIDEO_FEED = "application/vnd.mozilla.maybe.video.feed";
 const TYPE_MAYBE_AUDIO_FEED = "application/vnd.mozilla.maybe.audio.feed";
 const TYPE_PDF = "application/pdf";
@@ -71,17 +70,16 @@ const kActionUsePlugin = 5;
 const ICON_URL_APP = AppConstants.platform == "linux" ?
                      "moz-icon://dummy.exe?size=16" :
                      "chrome://browser/skin/preferences/application.png";
 
 // For CSS. Can be one of "ask", "save", "plugin" or "feed". If absent, the icon URL
 // was set by us to a custom handler icon and CSS should not try to override it.
 const APP_ICON_ATTR_NAME = "appHandlerIcon";
 
-//* ***************************************************************************//
 // Utilities
 
 function getFileDisplayName(file) {
   if (AppConstants.platform == "win") {
     if (file instanceof Ci.nsILocalFileWin) {
       try {
         return file.getVersionInfoField("FileDescription");
       } catch (e) {}
@@ -129,17 +127,16 @@ ArrayEnumerator.prototype = {
     return this._contents[this._index++];
   }
 };
 
 function isFeedType(t) {
   return t == TYPE_MAYBE_FEED || t == TYPE_MAYBE_VIDEO_FEED || t == TYPE_MAYBE_AUDIO_FEED;
 }
 
-//* ***************************************************************************//
 // HandlerInfoWrapper
 
 /**
  * This object wraps nsIHandlerInfo with some additional functionality
  * the Applications prefpane needs to display and allow modification of
  * the list of handled types.
  *
  * We create an instance of this wrapper for each entry we might display
@@ -159,34 +156,32 @@ function HandlerInfoWrapper(aType, aHand
 
 HandlerInfoWrapper.prototype = {
   // The wrapped nsIHandlerInfo object.  In general, this object is private,
   // but there are a couple cases where callers access it directly for things
   // we haven't (yet?) implemented, so we make it a public property.
   wrappedHandlerInfo: null,
 
 
-  //* *************************************************************************//
   // Convenience Utils
 
   _handlerSvc: Cc["@mozilla.org/uriloader/handler-service;1"].
                getService(Ci.nsIHandlerService),
 
   _prefSvc: Cc["@mozilla.org/preferences-service;1"].
             getService(Ci.nsIPrefBranch),
 
   _categoryMgr: Cc["@mozilla.org/categorymanager;1"].
                 getService(Ci.nsICategoryManager),
 
   element: function(aID) {
     return document.getElementById(aID);
   },
 
 
-  //* *************************************************************************//
   // nsIHandlerInfo
 
   // The MIME type or protocol scheme.
   _type: null,
   get type() {
     return this._type;
   },
 
@@ -317,17 +312,16 @@ HandlerInfoWrapper.prototype = {
     return this.wrappedHandlerInfo.alwaysAskBeforeHandling;
   },
 
   set alwaysAskBeforeHandling(aNewValue) {
     this.wrappedHandlerInfo.alwaysAskBeforeHandling = aNewValue;
   },
 
 
-  //* *************************************************************************//
   // nsIMIMEInfo
 
   // The primary file extension associated with this type, if any.
   //
   // XXX Plugin objects contain an array of MimeType objects with "suffixes"
   // properties; if this object has an associated plugin, shouldn't we check
   // those properties for an extension?
   get primaryExtension() {
@@ -336,17 +330,16 @@ HandlerInfoWrapper.prototype = {
           this.wrappedHandlerInfo.primaryExtension)
         return this.wrappedHandlerInfo.primaryExtension
     } catch (ex) {}
 
     return null;
   },
 
 
-  //* *************************************************************************//
   // Plugin Handling
 
   // A plugin that can handle this type, if any.
   //
   // Note: just because we have one doesn't mean it *will* handle the type.
   // That depends on whether or not the type is in the list of types for which
   // plugin handling is disabled.
   plugin: null,
@@ -412,25 +405,23 @@ HandlerInfoWrapper.prototype = {
       addCategoryEntry("Gecko-Content-Viewers",
                        this.type,
                        "@mozilla.org/content/plugin/document-loader-factory;1",
                        false,
                        true);
   },
 
 
-  //* *************************************************************************//
   // Storage
 
   store: function() {
     this._handlerSvc.store(this.wrappedHandlerInfo);
   },
 
 
-  //* *************************************************************************//
   // Icons
 
   get smallIcon() {
     return this._getIcon(16);
   },
 
   _getIcon: function(aSize) {
     if (this.primaryExtension)
@@ -442,17 +433,16 @@ HandlerInfoWrapper.prototype = {
     // FIXME: consider returning some generic icon when we can't get a URL for
     // one (for example in the case of protocol schemes).  Filed as bug 395141.
     return null;
   }
 
 };
 
 
-//* ***************************************************************************//
 // Feed Handler Info
 
 /**
  * This object implements nsIHandlerInfo for the feed types.  It's a separate
  * object because we currently store handling information for the feed type
  * in a set of preferences rather than the nsIHandlerService-managed datastore.
  *
  * This object inherits from HandlerInfoWrapper in order to get functionality
@@ -466,26 +456,24 @@ HandlerInfoWrapper.prototype = {
 
 function FeedHandlerInfo(aMIMEType) {
   HandlerInfoWrapper.call(this, aMIMEType, null);
 }
 
 FeedHandlerInfo.prototype = {
   __proto__: HandlerInfoWrapper.prototype,
 
-  //* *************************************************************************//
   // Convenience Utils
 
   _converterSvc:
     Cc["@mozilla.org/embeddor.implemented/web-content-handler-registrar;1"].
     getService(Ci.nsIWebContentConverterService),
 
   _shellSvc: AppConstants.HAVE_SHELL_SERVICE ? getShellService() : null,
 
-  //* *************************************************************************//
   // nsIHandlerInfo
 
   get description() {
     return this.element("bundlePreferences").getString(this._appPrefLabel);
   },
 
   get preferredApplicationHandler() {
     switch (this.element(this._prefSelectedReader).value) {
@@ -718,25 +706,23 @@ FeedHandlerInfo.prototype = {
   // We use this to suppress notification-triggered updates to the list when
   // we make changes that may spawn such updates, specifically when we change
   // the action for the feed type, which results in feed preference updates,
   // which spawn "pref changed" notifications that would otherwise cause us
   // to rebuild the view unnecessarily.
   _storingAction: false,
 
 
-  //* *************************************************************************//
   // nsIMIMEInfo
 
   get primaryExtension() {
     return "xml";
   },
 
 
-  //* *************************************************************************//
   // Storage
 
   // Changes to the preferred action and handler take effect immediately
   // (we write them out to the preferences right as they happen),
   // so we when the controller calls store() after modifying the handlers,
   // the only thing we need to store is the removal of possible handlers
   // XXX Should we hold off on making the changes until this method gets called?
   store: function() {
@@ -754,17 +740,16 @@ FeedHandlerInfo.prototype = {
         app.QueryInterface(Ci.nsIWebContentHandlerInfo);
         this._converterSvc.removeContentHandler(app.contentType, app.uri);
       }
     }
     this._possibleApplicationHandlers._removed = [];
   },
 
 
-  //* *************************************************************************//
   // Icons
 
   get smallIcon() {
     return this._smallIcon;
   }
 
 };
 
@@ -834,17 +819,16 @@ var pdfHandlerInfo = {
   _handlerChanged: TOPIC_PDFJS_HANDLER_CHANGED,
   _appPrefLabel: "portableDocumentFormat",
   get enabled() {
     return !Services.prefs.getBoolPref(PREF_PDFJS_DISABLED);
   },
 };
 
 
-//* ***************************************************************************//
 // Prefpane Controller
 
 var gApplicationsPane = {
   // The set of types the app knows how to handle.  A hash of HandlerInfoWrapper
   // objects, indexed by type.
   _handledTypes: {},
 
   // The list of types we can show, sorted by the sort column/direction.
@@ -858,17 +842,16 @@ var gApplicationsPane = {
 
   // A count of the number of times each visible type description appears.
   // We use these counts to determine whether or not to annotate descriptions
   // with their types to distinguish duplicate descriptions from each other.
   // A hash of integer counts, indexed by string description.
   _visibleTypeDescriptionCount: {},
 
 
-  //* *************************************************************************//
   // Convenience & Performance Shortcuts
 
   // These get defined by init().
   _brandShortName : null,
   _prefsBundle    : null,
   _list           : null,
   _filter         : null,
 
@@ -883,17 +866,16 @@ var gApplicationsPane = {
 
   _handlerSvc   : Cc["@mozilla.org/uriloader/handler-service;1"].
                   getService(Ci.nsIHandlerService),
 
   _ioSvc        : Cc["@mozilla.org/network/io-service;1"].
                   getService(Ci.nsIIOService),
 
 
-  //* *************************************************************************//
   // Initialization & Destruction
 
   init: function() {
     function setEventListener(aId, aEventType, aCallback)
     {
       document.getElementById(aId)
               .addEventListener(aEventType, aCallback.bind(gApplicationsPane));
     }
@@ -986,30 +968,28 @@ var gApplicationsPane = {
 
     this._prefSvc.removeObserver(PREF_AUDIO_FEED_SELECTED_APP, this);
     this._prefSvc.removeObserver(PREF_AUDIO_FEED_SELECTED_WEB, this);
     this._prefSvc.removeObserver(PREF_AUDIO_FEED_SELECTED_ACTION, this);
     this._prefSvc.removeObserver(PREF_AUDIO_FEED_SELECTED_READER, this);
   },
 
 
-  //* *************************************************************************//
   // nsISupports
 
   QueryInterface: function(aIID) {
     if (aIID.equals(Ci.nsIObserver) ||
         aIID.equals(Ci.nsIDOMEventListener ||
         aIID.equals(Ci.nsISupports)))
       return this;
 
     throw Cr.NS_ERROR_NO_INTERFACE;
   },
 
 
-  //* *************************************************************************//
   // nsIObserver
 
   observe: function (aSubject, aTopic, aData) {
     // Rebuild the list when there are changes to preferences that influence
     // whether or not to show certain entries in the list.
     if (aTopic == "nsPref:changed" && !this._storingAction) {
       // These two prefs alter the list of visible types, so we have to rebuild
       // that list when they change.
@@ -1021,27 +1001,25 @@ var gApplicationsPane = {
 
       // All the prefs we observe can affect what we display, so we rebuild
       // the view when any of them changes.
       this._rebuildView();
     }
   },
 
 
-  //* *************************************************************************//
   // nsIDOMEventListener
 
   handleEvent: function(aEvent) {
     if (aEvent.type == "unload") {
       this.destroy();
     }
   },
 
 
-  //* *************************************************************************//
   // Composed Model Construction
 
   _loadData: function() {
     this._loadFeedHandler();
     this._loadInternalHandlers();
     this._loadPluginHandlers();
     this._loadApplicationHandlers();
   },
@@ -1126,17 +1104,16 @@ var gApplicationsPane = {
         this._handledTypes[type] = handlerInfoWrapper;
       }
 
       handlerInfoWrapper.handledOnlyByPlugin = false;
     }
   },
 
 
-  //* *************************************************************************//
   // View Construction
 
   _rebuildVisibleTypes: function() {
     // Reset the list of visible types and the visible type description counts.
     this._visibleTypes = [];
     this._visibleTypeDescriptionCount = {};
 
     // Get the preferences that help determine what types to show.
@@ -1550,17 +1527,16 @@ var gApplicationsPane = {
         break;
       case Ci.nsIHandlerInfo.saveToDisk:
         menu.selectedItem = saveMenuItem;
         break;
     }
   },
 
 
-  //* *************************************************************************//
   // Sorting & Filtering
 
   _sortColumn: null,
 
   /**
    * Sort the list when the user clicks on a column header.
    */
   sort: function (event) {
@@ -1623,17 +1599,16 @@ var gApplicationsPane = {
   },
 
   focusFilterBox: function() {
     this._filter.focus();
     this._filter.select();
   },
 
 
-  //* *************************************************************************//
   // Changes
 
   onSelectAction: function(aActionItem) {
     this._storingAction = true;
 
     try {
       this._storeAction(aActionItem);
     }

--- a/toolkit/components/contentprefs/nsContentPrefService.js
+++ b/toolkit/components/contentprefs/nsContentPrefService.js
@@ -44,17 +44,16 @@ cache.set = function CPS_cache_set(group
         break;
     }
   }
 };
 
 const privModeStorage = new ContentPrefStore();
 
 ContentPrefService.prototype = {
-  //* *************************************************************************//
   // XPCOM Plumbing
 
   classID: Components.ID("{e3f772f3-023f-4b32-b074-36cf0fd5d414}"),
 
   QueryInterface: function CPS_QueryInterface(iid) {
     let supportedIIDs = [
       Ci.nsIContentPrefService,
       Ci.nsISupports,
@@ -67,17 +66,16 @@ ContentPrefService.prototype = {
         Cu.import("resource://gre/modules/ContentPrefService2.jsm", s);
         this._contentPrefService2 = new s.ContentPrefService2(this);
       }
       return this._contentPrefService2;
     }
     throw Cr.NS_ERROR_NO_INTERFACE;
   },
 
-  //* *************************************************************************//
   // Convenience Getters
 
   // Observer Service
   __observerSvc: null,
   get _observerSvc() {
     if (!this.__observerSvc)
       this.__observerSvc = Cc["@mozilla.org/observer-service;1"].
                            getService(Ci.nsIObserverService);
@@ -98,17 +96,16 @@ ContentPrefService.prototype = {
   get _prefSvc() {
     if (!this.__prefSvc)
       this.__prefSvc = Cc["@mozilla.org/preferences-service;1"].
                        getService(Ci.nsIPrefBranch);
     return this.__prefSvc;
   },
 
 
-  //* *************************************************************************//
   // Destruction
 
   _destroy: function ContentPrefService__destroy() {
     this._observerSvc.removeObserver(this, "xpcom-shutdown");
     this._observerSvc.removeObserver(this, "last-pb-context-exited");
 
     // Finalize statements which may have been used asynchronously.
     // FIXME(696499): put them in an object cache like other components.
@@ -186,38 +183,35 @@ ContentPrefService.prototype = {
     delete this._genericObservers;
     delete this.__consoleSvc;
     delete this.__grouper;
     delete this.__observerSvc;
     delete this.__prefSvc;
   },
 
 
-  //* *************************************************************************//
   // nsIObserver
 
   observe: function ContentPrefService_observe(subject, topic, data) {
     switch (topic) {
       case "xpcom-shutdown":
         this._destroy();
         break;
       case "last-pb-context-exited":
         this._privModeStorage.removeAll();
         break;
     }
   },
 
 
-  //* *************************************************************************//
   // in-memory cache and private-browsing stores
 
   _cache: cache,
   _privModeStorage: privModeStorage,
 
-  //* *************************************************************************//
   // nsIContentPrefService
 
   getPref: function ContentPrefService_getPref(aGroup, aName, aContext, aCallback) {
     warnDeprecated();
 
     if (!aName)
       throw Components.Exception("aName cannot be null or an empty string",
                                  Cr.NS_ERROR_ILLEGAL_VALUE);
@@ -564,17 +558,16 @@ ContentPrefService.prototype = {
   },
 
   get DBConnection() {
     warnDeprecated();
     return this._dbConnection;
   },
 
 
-  //* *************************************************************************//
   // Data Retrieval & Modification
 
   __stmtSelectPref: null,
   get _stmtSelectPref() {
     if (!this.__stmtSelectPref)
       this.__stmtSelectPref = this._dbCreateStatement(`
         SELECT prefs.value AS value
         FROM prefs
@@ -992,17 +985,16 @@ ContentPrefService.prototype = {
     if (typeof global != "undefined") {
       prefs.setProperty(null, global);
     }
 
     return prefs;
   },
 
 
-  //* *************************************************************************//
   // Database Creation & Access
 
   _dbVersion: 4,
 
   _dbSchema: {
     tables: {
       groups:     "id           INTEGER PRIMARY KEY, \
                    name         TEXT NOT NULL",
@@ -1256,23 +1248,21 @@ function warnDeprecated() {
                      "https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIContentPrefService2",
                      Components.stack.caller);
 }
 
 
 function HostnameGrouper() {}
 
 HostnameGrouper.prototype = {
-  //* *************************************************************************//
   // XPCOM Plumbing
 
   classID:          Components.ID("{8df290ae-dcaa-4c11-98a5-2429a4dc97bb}"),
   QueryInterface:   XPCOMUtils.generateQI([Ci.nsIContentURIGrouper]),
 
-  //* *************************************************************************//
   // nsIContentURIGrouper
 
   group: function HostnameGrouper_group(aURI) {
     var group;
 
     try {
       // Accessing the host property of the URI will throw an exception
       // if the URI is of a type that doesn't have a host property.
@@ -1331,13 +1321,12 @@ AsyncStatement.prototype = {
             aReason == Ci.mozIStorageStatementCallback.REASON_FINISHED)
           this._callback.onResult(undefined);
       },
       handleError: function(aError) {}
     });
   }
 };
 
-//* ***************************************************************************//
 // XPCOM Plumbing
 
 var components = [ContentPrefService, HostnameGrouper];
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);

--- a/toolkit/components/contentprefs/tests/unit/head_contentPrefs.js
+++ b/toolkit/components/contentprefs/tests/unit/head_contentPrefs.js
@@ -11,17 +11,16 @@ var Cu = Components.utils;
 
 Cu.import('resource://gre/modules/Services.jsm');
 Cu.import('resource://gre/modules/ContentPrefInstance.jsm');
 
 const CONTENT_PREFS_DB_FILENAME = "content-prefs.sqlite";
 const CONTENT_PREFS_BACKUP_DB_FILENAME = "content-prefs.sqlite.corrupt";
 
 var ContentPrefTest = {
-  //* *************************************************************************//
   // Convenience Getters
 
   __dirSvc: null,
   get _dirSvc() {
     if (!this.__dirSvc)
       this.__dirSvc = Cc["@mozilla.org/file/directory_service;1"].
                       getService(Ci.nsIProperties);
     return this.__dirSvc;
@@ -39,45 +38,42 @@ var ContentPrefTest = {
   get _ioSvc() {
     if (!this.__ioSvc)
       this.__ioSvc = Cc["@mozilla.org/network/io-service;1"].
                      getService(Ci.nsIIOService);
     return this.__ioSvc;
   },
 
 
-  //* *************************************************************************//
   // nsISupports
 
   interfaces: [Ci.nsIDirectoryServiceProvider, Ci.nsISupports],
 
   QueryInterface: function ContentPrefTest_QueryInterface(iid) {
     if (!this.interfaces.some( function(v) { return iid.equals(v) } ))
       throw Cr.NS_ERROR_NO_INTERFACE;
     return this;
   },
 
 
-  //* *************************************************************************//
   // nsIDirectoryServiceProvider
 
   getFile: function ContentPrefTest_getFile(property, persistent) {
     persistent.value = true;
 
     if (property == "ProfD")
       return this._dirSvc.get("CurProcD", Ci.nsIFile);
 
     // This causes extraneous errors to show up in the log when the directory
     // service asks us first for CurProcD and MozBinD.  I wish there was a way
     // to suppress those errors.
     throw Cr.NS_ERROR_FAILURE;
   },
 
 
-  //* *************************************************************************//
   // Utilities
 
   getURI: function ContentPrefTest_getURI(spec) {
     return this._ioSvc.newURI(spec, null, null);
   },
 
   /**
    * Get the profile directory.

--- a/toolkit/components/contentprefs/tests/unit/test_contentPrefs.js
+++ b/toolkit/components/contentprefs/tests/unit/test_contentPrefs.js
@@ -1,14 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 function run_test() {
-  //* *************************************************************************//
   // Database Creation, Schema Migration, and Backup
 
   // Note: in these tests we use createInstance instead of getService
   // so we can instantiate the service multiple times and make it run
   // its database initialization code each time.
 
   // Create a new database.
   {
@@ -107,26 +106,24 @@ function run_test() {
 
   var uri = ContentPrefTest.getURI("http://www.example.com/");
 
   // Make sure disk synchronization checking is turned off by default.
   var statement = cps.DBConnection.createStatement("PRAGMA synchronous");
   statement.executeStep();
   do_check_eq(0, statement.getInt32(0));
 
-  //* *************************************************************************//
   // Nonexistent Pref
 
   do_check_eq(cps.getPref(uri, "test.nonexistent.getPref"), undefined);
   do_check_eq(cps.setPref(uri, "test.nonexistent.setPref", 5), undefined);
   do_check_false(cps.hasPref(uri, "test.nonexistent.hasPref"));
   do_check_eq(cps.removePref(uri, "test.nonexistent.removePref"), undefined);
 
 
-  //* *************************************************************************//
   // Existing Pref
 
   cps.setPref(uri, "test.existing", 5);
 
   // getPref should return the pref value
   do_check_eq(cps.getPref(uri, "test.existing"), 5);
 
   // setPref should return undefined and change the value of the pref
@@ -136,17 +133,16 @@ function run_test() {
   // hasPref should return true
   do_check_true(cps.hasPref(uri, "test.existing"));
 
   // removePref should return undefined and remove the pref
   do_check_eq(cps.removePref(uri, "test.existing"), undefined);
   do_check_false(cps.hasPref(uri, "test.existing"));
 
 
-  //* *************************************************************************//
   // Round-Trip Data Integrity
 
   // Make sure pref values remain the same from setPref to getPref.
 
   cps.setPref(uri, "test.data-integrity.integer", 5);
   do_check_eq(cps.getPref(uri, "test.data-integrity.integer"), 5);
 
   cps.setPref(uri, "test.data-integrity.float", 5.5);
@@ -179,33 +175,31 @@ function run_test() {
 
   do_check_false(cps.hasPref(uri, "test.data-integrity.integer"));
   do_check_false(cps.hasPref(uri, "test.data-integrity.float"));
   do_check_false(cps.hasPref(uri, "test.data-integrity.boolean"));
   do_check_false(cps.hasPref(uri, "test.data-integrity.string"));
   do_check_false(cps.hasPref(uri, "test.data-integrity.null"));
 
 
-  //* *************************************************************************//
   // getPrefs
 
   cps.setPref(uri, "test.getPrefs.a", 1);
   cps.setPref(uri, "test.getPrefs.b", 2);
   cps.setPref(uri, "test.getPrefs.c", 3);
 
   var prefs = cps.getPrefs(uri);
   do_check_true(prefs.hasKey("test.getPrefs.a"));
   do_check_eq(prefs.get("test.getPrefs.a"), 1);
   do_check_true(prefs.hasKey("test.getPrefs.b"));
   do_check_eq(prefs.get("test.getPrefs.b"), 2);
   do_check_true(prefs.hasKey("test.getPrefs.c"));
   do_check_eq(prefs.get("test.getPrefs.c"), 3);
 
 
-  //* *************************************************************************//
   // Site-Specificity
 
   // These are all different sites, and setting a pref for one of them
   // shouldn't set it for the others.
   var uri1 = ContentPrefTest.getURI("http://www.domain1.com/");
   var uri2 = ContentPrefTest.getURI("http://foo.domain1.com/");
   var uri3 = ContentPrefTest.getURI("http://domain1.com/");
   var uri4 = ContentPrefTest.getURI("http://www.domain2.com/");
@@ -226,17 +220,16 @@ function run_test() {
   do_check_false(cps.hasPref(uri4, "test.site-specificity.uri3"));
 
   cps.setPref(uri4, "test.site-specificity.uri4", 5);
   do_check_false(cps.hasPref(uri1, "test.site-specificity.uri4"));
   do_check_false(cps.hasPref(uri2, "test.site-specificity.uri4"));
   do_check_false(cps.hasPref(uri3, "test.site-specificity.uri4"));
 
 
-  //* *************************************************************************//
   // Observers
 
   var specificObserver = {
     interfaces: [Ci.nsIContentPrefObserver, Ci.nsISupports],
 
     QueryInterface: function ContentPrefTest_QueryInterface(iid) {
       if (!this.interfaces.some( function(v) { return iid.equals(v) } ))
         throw Cr.NS_ERROR_NO_INTERFACE;
@@ -328,17 +321,16 @@ function run_test() {
   cps.setPref(uri, "test.observer.1", "test value");
   cps.removePref(uri, "test.observer.1", "test value");
   do_check_eq(specificObserver.numTimesSetCalled, 1);
   do_check_eq(genericObserver.numTimesSetCalled, 4);
   do_check_eq(specificObserver.numTimesRemovedCalled, 1);
   do_check_eq(genericObserver.numTimesRemovedCalled, 3);
 
 
-  //* *************************************************************************//
   // Get/Remove Prefs By Name
 
   {
     var anObserver = {
       interfaces: [Ci.nsIContentPrefObserver, Ci.nsISupports],
 
       QueryInterface: function ContentPrefTest_QueryInterface(iid) {
         if (!this.interfaces.some( function(v) { return iid.equals(v) } ))
@@ -416,17 +408,16 @@ function run_test() {
 
     // Clean up after ourselves
     cps.removePref(uri1, "test.byname.2");
     cps.removePref(uri3, "test.byname.3");
     cps.removePref(null, "test.byname.2");
   }
 
 
-  //* *************************************************************************//
   // Clear Private Data Pref Removal
 
   {
     let uri1 = ContentPrefTest.getURI("http://www.domain1.com/");
     let uri2 = ContentPrefTest.getURI("http://www.domain2.com/");
     let uri3 = ContentPrefTest.getURI("http://www.domain3.com/");
 
     let dbConnection = cps.DBConnection;

--- a/toolkit/components/passwordmgr/storage-mozStorage.js
+++ b/toolkit/components/passwordmgr/storage-mozStorage.js
@@ -796,17 +796,16 @@ LoginManagerStorage_mozStorage.prototype
       }
       result.push(login);
     }
 
     return result;
   },
 
 
-  //* *************************************************************************//
   // Database Creation & Access
 
   /**
    * Creates a statement, wraps it, and then does parameter replacement
    * Returns the wrapped statement for execution.  Will use memoization
    * so that statements can be reused.
    */
   _dbCreateStatement : function (query, params) {

--- a/toolkit/components/places/tests/queries/test_onlyBookmarked.js
+++ b/toolkit/components/places/tests/queries/test_onlyBookmarked.js
@@ -69,20 +69,17 @@ add_task(function* test_onlyBookmarked()
 
   // You can use this to compare the data in the array with the result set,
   // if the array's isInQuery: true items are sorted the same way as the result
   // set.
   do_print("begin first test");
   compareArrayToResult(testData, root);
   do_print("end first test");
 
-  /* ******************
-  Test live-update
-  ********************/
-
+  // Test live-update
   var liveUpdateTestData = [
     // Add a bookmark that should show up
     { isBookmark: true,
       uri: "http://bookmarked2.com/",
       parentGuid: PlacesUtils.bookmarks.toolbarGuid,
       index: PlacesUtils.bookmarks.DEFAULT_INDEX,
       isInQuery: true },
 

--- a/toolkit/components/satchel/nsFormHistory.js
+++ b/toolkit/components/satchel/nsFormHistory.js
@@ -543,17 +543,16 @@ FormHistory.prototype = {
     },
 
 
     updatePrefs : function () {
         this.debug          = Services.prefs.getBoolPref("browser.formfill.debug");
         this.enabled        = Services.prefs.getBoolPref("browser.formfill.enable");
     },
 
-//* *************************************************************************//
     // Database Creation & Access
 
     /*
      * dbCreateStatement
      *
      * Creates a statement, wraps it, and then does parameter replacement
      * Will use memoization so that statements can be reused.
      */