Tidy up the Waratek entity internals, using latest Brooklyn changes