Clean up some type hinting code.