Address Allen's comments (except ones that need SRP to fix).