modernized entity handling in Mojo::Util a bit