Shake out some more fas/gh confusion.