Remove potential for null EMPTY_METADATA
Move things around a bit