Removed unnecessary EP, introduced Rename Handler for Python Magic Literals.
Remove code duplication.