Slightly related to DEVELOPER-351

Mostly just a reformat of things. All of DEVELOPER-351 has been done in
aweplug and the update to awestruct 0.5.4