Merge "Re-enable closeguard on a few classes that were missing it."