Make things more similar across Python versions