diff --git a/sys/conf/options b/sys/conf/options
index 8fefa39f5040..2decd10e6f97 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -72,15 +72,14 @@ ADW_ALLOW_MEMIO		opt_adw.h	# Allow PCI devices to use memory
 					# mapped I/O
 
 # Miscellaneous options.
-ALQ
 ADAPTIVE_MUTEXES
+ALQ
 COMPAT_43	opt_compat.h
 COMPAT_FREEBSD4	opt_compat.h
 COMPAT_SUNOS	opt_compat.h
-NO_COMPAT_FREEBSD4	opt_compat.h
 COMPILING_LINT	opt_global.h
-CY_PCI_FASTINTR
 CONSPEED	opt_comconsole.h
+CY_PCI_FASTINTR
 DDB
 DDB_NOKLDSYM	opt_ddb.h
 DDB_TRACE
@@ -103,12 +102,26 @@ KSTACK_MAX_PAGES
 KTRACE
 KTRACE_REQUEST_POOL	opt_ktrace.h
 LIBICONV
+MAC
+MAC_ALWAYS_LABEL_MBUF	opt_mac.h
+MAC_BIBA	opt_dontuse.h
+MAC_BSDEXTENDED	opt_dontuse.h
+MAC_DEBUG	opt_mac.h
+MAC_IFOFF	opt_dontuse.h
+MAC_LOMAC	opt_dontuse.h
+MAC_MLS		opt_dontuse.h
+MAC_NONE	opt_dontuse.h
+MAC_PARTITION	opt_dontuse.h
+MAC_PORTACL	opt_dontuse.h
+MAC_SEEOTHERUIDS	opt_dontuse.h
+MAC_TEST	opt_dontuse.h
 MD_ROOT		opt_md.h
 MD_ROOT_SIZE	opt_md.h
 NDGBPORTS	opt_dgb.h
-NTIMECOUNTER	opt_ntp.h
+NO_COMPAT_FREEBSD4	opt_compat.h
 NSWAPDEV	opt_swap.h
 NSWBUF_MIN	opt_swap.h
+NTIMECOUNTER	opt_ntp.h
 PANIC_REBOOT_WAIT_TIME	opt_panic.h
 PPS_SYNC	opt_ntp.h
 PUC_FASTINTR	opt_puc.h
@@ -149,29 +162,6 @@ DIRECTIO	opt_directio.h
 _KPOSIX_PRIORITY_SCHEDULING	opt_posix.h
 P1003_1B_SEMAPHORES		opt_posix.h
 
-#####################################################################
-# SECURITY POLICY PARAMETERS
-
-# Support for Mandatory Access Control (MAC), extensible kernel
-# access control framework.
-MAC
-
-# Options for MAC framework behavior and performance
-MAC_ALWAYS_LABEL_MBUF	opt_mac.h
-
-# MAC policy modules that can be linked into the kernel
-MAC_BIBA	opt_dontuse.h
-MAC_BSDEXTENDED	opt_dontuse.h
-MAC_DEBUG	opt_mac.h
-MAC_IFOFF	opt_dontuse.h
-MAC_LOMAC	opt_dontuse.h
-MAC_MLS		opt_dontuse.h
-MAC_NONE	opt_dontuse.h
-MAC_PARTITION	opt_dontuse.h
-MAC_PORTACL	opt_dontuse.h
-MAC_SEEOTHERUIDS	opt_dontuse.h
-MAC_TEST	opt_dontuse.h
-
 # Do we want the config file compiled into the kernel?
 INCLUDE_CONFIG_FILE	opt_config.h
 
@@ -183,24 +173,24 @@ CD9660		opt_dontuse.h
 CODA		opt_dontuse.h
 EXT2FS		opt_dontuse.h
 FDESCFS		opt_dontuse.h
+HPFS		opt_dontuse.h
 LINPROCFS	opt_dontuse.h
 MSDOSFS		opt_dontuse.h
+NTFS		opt_dontuse.h
 NULLFS		opt_dontuse.h
 NWFS		opt_dontuse.h
 PORTALFS	opt_dontuse.h
 PROCFS		opt_dontuse.h
 PSEUDOFS	opt_dontuse.h
-UMAPFS		opt_dontuse.h
-NTFS		opt_dontuse.h
-HPFS		opt_dontuse.h
 SMBFS		opt_dontuse.h
-UNIONFS		opt_dontuse.h
 UDF		opt_dontuse.h
+UMAPFS		opt_dontuse.h
+UNIONFS		opt_dontuse.h
 
 # Broken - ffs_snapshot() dependency from ufs_lookup() :-(
 FFS		opt_ffs_broken_fixme.h
 
-# These static filesystems has one slightly bogus static dependency in
+# These static filesystems have one slightly bogus static dependency in
 # sys/i386/i386/autoconf.c.  If any of these filesystems are
 # statically compiled into the kernel, code for mounting them as root
 # filesystems will be enabled - but look below.
@@ -227,7 +217,8 @@ UFS_EXTATTR_AUTOSTART	opt_ufs.h
 # Enable fast hash lookups for large directories on UFS-based filesystems.
 UFS_DIRHASH	opt_ufs.h
 
-# The above static dependencies are planned removed, with a
+# The below sentence is not in English, and neither is this one.
+# We plan to remove the static dependences above, with a
 # <filesystem>_ROOT option to control if it usable as root.  This list
 # allows these options to be present in config files already (though
 # they won't make any difference yet).
@@ -263,8 +254,6 @@ SCSI_DELAY		opt_scsi.h
 SCSI_NO_SENSE_STRINGS	opt_scsi.h
 SCSI_NO_OP_STRINGS	opt_scsi.h
 
-
-
 # Options used only in cam/scsi/scsi_cd.c
 CHANGER_MIN_BUSY_SECONDS	opt_cd.h
 CHANGER_MAX_BUSY_SECONDS	opt_cd.h
@@ -306,6 +295,10 @@ ISP_TARGET_MODE		opt_isp.h
 ISP_FW_CRASH_DUMP	opt_isp.h
 
 # Options used in the 'ata' ATA/ATAPI driver
+ACD_DEBUG		opt_ata.h
+AST_DEBUG		opt_ata.h
+ATAPI_DEBUG		opt_ata.h
+ATA_DEBUG		opt_ata.h
 ATA_STATIC_ID		opt_ata.h
 ATA_NOPCI		opt_ata.h
 DEV_ATADISK		opt_ata.h
@@ -313,10 +306,6 @@ DEV_ATAPICD		opt_ata.h
 DEV_ATAPIST		opt_ata.h
 DEV_ATAPIFD		opt_ata.h
 DEV_ATAPICAM		opt_ata.h
-ATA_DEBUG		opt_ata.h
-ATAPI_DEBUG		opt_ata.h
-ACD_DEBUG		opt_ata.h
-AST_DEBUG		opt_ata.h
 
 # Net stuff.
 ACCEPT_FILTER_DATA
@@ -388,8 +377,8 @@ NETGRAPH_HOLE		opt_netgraph.h
 NETGRAPH_IFACE		opt_netgraph.h
 NETGRAPH_IP_INPUT	opt_netgraph.h
 NETGRAPH_KSOCKET	opt_netgraph.h
-NETGRAPH_LMI		opt_netgraph.h
 NETGRAPH_L2TP		opt_netgraph.h
+NETGRAPH_LMI		opt_netgraph.h
 # MPPC compression requires proprietary files (not included)
 NETGRAPH_MPPC_COMPRESSION	opt_netgraph.h
 NETGRAPH_MPPC_ENCRYPTION	opt_netgraph.h
@@ -409,7 +398,6 @@ NETGRAPH_VJC		opt_netgraph.h
 DRM_LINUX		opt_drm.h
 DRM_DEBUG		opt_drm.h
 
-
 ZERO_COPY_SOCKETS	opt_zero.h
 TI_PRIVATE_JUMBOS	opt_ti.h
 TI_JUMBO_HDRSPLIT	opt_ti.h
@@ -466,10 +454,10 @@ BLKDEV_IOSIZE		opt_global.h
 DEBUG			opt_global.h
 DEBUG_LOCKS		opt_global.h
 DEBUG_VFS_LOCKS		opt_global.h
-LOOKUP_SHARED		opt_global.h
 DIAGNOSTIC		opt_global.h
 INVARIANT_SUPPORT	opt_global.h
 INVARIANTS		opt_global.h
+LOOKUP_SHARED		opt_global.h
 MCLSHIFT		opt_global.h
 MSIZE			opt_global.h
 REGRESSION		opt_global.h
@@ -568,11 +556,11 @@ ROOTDEVNAME		opt_rootdevname.h
 FDC_DEBUG		opt_fdc.h
 PCFCLOCK_VERBOSE	opt_pcfclock.h
 PCFCLOCK_MAX_RETRIES	opt_pcfclock.h
+TDFX_LINUX		opt_tdfx.h
 
 # RAIDframe options
 RAID_AUTOCONFIG		opt_raid.h
 RAID_DEBUG		opt_raid.h
-TDFX_LINUX opt_tdfx.h
 
 KTR			opt_global.h
 KTR_ALQ			opt_ktr.h
@@ -581,7 +569,6 @@ KTR_CPUMASK		opt_ktr.h
 KTR_COMPILE		opt_global.h
 KTR_ENTRIES		opt_global.h
 KTR_VERBOSE		opt_ktr.h
-MUTEX_DEBUG		opt_global.h
 WITNESS			opt_global.h
 WITNESS_DDB		opt_witness.h
 WITNESS_SKIPSPIN	opt_witness.h
@@ -606,12 +593,8 @@ ED_NO_MIIBUS		opt_ed.h
 # wi driver
 WI_SYMBOL_FIRMWARE	opt_wi.h
 
-# Polling device handling
+# XXX bogusly global.
 DEVICE_POLLING		opt_global.h
-
-# Mutex profiling
-MUTEX_PROFILING		opt_global.h
-
 # options for ubsec driver
 UBSEC_DEBUG		opt_ubsec.h
 UBSEC_RNDTEST		opt_ubsec.h