Fix expander to remove group when not needed.