pep-394 and shebang cleanup