Miscellaneous reorganization.