Bug 1002494 - Address davehunt comments