lalalune: Focused on bugfix work, making two commits that modified 92 files with a net reduction of 15,112 lines of code.