More closure cosmetics/consistency/correctness