OpenElementStack refactorings