Correct handling of modaliases and handlers.