Increase builder coverage by removing unused code paths
Python 3.x proofing