Remove addRetAttributes and addFnAttributes, which aren't useful abstractions.