Update to current nightly, add useful data handling macros.