Add a variable timeout to the SimplerTime makefile, for quicker debugging.
Catch up with some halvm-ghc fixes.