I hate 'unless' but that is my personal taste. I would not mind putting this in if the logic is sound and if you guys decide that it looks too ugly for your taste, replace or wait until you deprecate 1.8 support and remove that ugliness all together.