Improve mode management. Specifically, unquote it.
Call `super()` instead.

Why wasn't super being called?