#236 Made ability to remove automatic expanders, for cases where we really don't want them.