Small spring cleanup of __main__

Not related to ongoing extension/config work.