I apparently messed up a lot (typos, bad decisions) in the previous
four commits.