Refactored guarding and inclusion.