A bit of an optimization of sorts...