This is the change that I'm proposing. It applies on top of https://bugs.freedesktop.org/attachment.cgi?id=37387 (Note, this patch isn't trying to solve the IncludeInferiors issues that I mentioned. It just frees other surfaces from the worries of IncludeInferiors.)