s4-python: More cleanups.