Improve type changes for Erlang/OTP 17.0 compilation (17.0rc1 will not be supported due to inconsistencies with 17.0).