Andrew: First review of Anshuman and Peng's posts (2).

Git workspace conflicts somehow ended up moving my changes to the
trash. Stupid trash.