Adjusting field-markers and making delving namespace aware. Formatting.