More tweaks from warningfix-dllimport-inline-method