Murder on the Links - Agatha Christie, John Moffatt

This was an interesting story but Hastings really proved himself to be a huge boob.  I cannot believe he didn't get run out of the place.  It wasn't until near the end that I was sure who the murderer was.  Does Poirot really keep him around after this story?  I am sure he is in the whole series but why I don't know.  I also found it really irritating that they decided the murderer had to be a man because a woman couldn't have dug the shallow grave.