Misc cleanup. (Wait, what? this is already three months old?! Holy shit!)