Here is a patch to replace the hard-coded limit with dynamic allocation. 
  I have only build-tested it, but it seems to work.

Please try it out; barring any screams to the contrary I'll add it to -tip.

	-hpa