Now simple and very general. Don't remember why it had
all the hard-coded stuff in the past.