Prepare a module for 1.8

Warning: does not compile (yet!)