Minor refactoring

Also, the flatgrass mapfill works.