Yes, I suppose that would elegantly solve the previously-mentioned issue, and be a bit faster, I'll change it.