CONTRIB TRIV: Delete vestigial @tags@
CONTRIB TRIV: Delete unnecessary return statements