Redo 11432f8 in a much cleaner style.