Comment 5 for bug 1494961

Marked this as Invalid since this isn't really a bug, just a request to investigate improving this code improvement. I've done the investigation and couldn't find a good way to improve it