This should be handled by the Scanner mixin already?