Removes history_number and adds a few tweaks.