Make compatible with base>=4.6 again (fixes #11)