Clean-up and guard correction.

Cleaned up unneeded activated guards, and added missing activated guards.