BAMPFA-247: More progress.
BAMPFA-247: Cleanup.