Fixed some API drift by making "used" attributes
in a better way.