Commit 8697d6a2cedaf8a395e10f6ae392608ee9b400be

Con Kolivas 2012-08-16T10:16:58

Do the cheaper comparison first.