Make extra JSON fields children of @fields

Rather than siblings. This is how the rest of our logging looks in
Kibana.