This makes things a bit simpler, removing a lot of duplicated states and adding
a compulsory boolean to GsApp to avoid overloading the kind.

The missing kind has also been converted to using the UNAVAILABLE state instead.