Cleanup Module#include
Fix Kernel#extend