Update history settings, move setopts around

Removing an autogenerated section means I actually need to organize the
resulting entries.