Razor-engine refactor (simplification).