Clean up RFC usage

Use RFC xxxx when NOT a xref! And, reduced number of times xref used (just used RFC xxxx).