More warnings during dub compilation, this is the final equivalent...