Stop using electric-* function and use defadvice instead