Refactoring of from-grid code.