Spacings and useless comments.
Spacings. Archiving preferences cleanup is separated into its own
function.
History plugin now respects local history archiving disabling.