Make sure that the rest of libshadowdive looks more or less consistent