Wikimaker changes to ElasticWindow. Re #6485.