Fix a couple k-CFA bugs.