The redisplay engine is getting really messy ...