Made an attempt to be more selective about when an offset is applied to minimise rendering errors.