Adaptation for POPL 2012.