Squash a few TODOs in the appendices.