Commit of Matthias' changes during conversation before merging his new
stuff.