Starting to slim down substitute.markup template