Simplify ExpansionBehavior to avoid using getters/setters
*** This bug has been marked as a duplicate of bug 240823 ***