Refactored fluent scanner interfaces a bit