Improve superOf implementation