I agree, but this is lifted from fireplace so it's essentially all pre-existing library code (@basta likes his underscores :)) - I'd prefer not to change it so we can drop in the UA enabled version down the road.