Managed to reduce splint warnings even more.