Since the installer logic was changed I went ahead and simplified it a hair.