Various unmerged homework fixes.