Changes to how lone else and elif are handled