static-fe overhaul (#236)