Noted this in the XXX comments.
Also, changed all three functions to use the attributes if they exist.