Manually merged changes from https://github.com/AdoptOpenJDK/jitwatch/pull/64/files