Future-proofing of...?  I think that's a good follow-up bug but shouldn't affect this.