Clean up glpk detection a little, fix a detection bug.