Bug 16497: (follow-up) Adapt to existing guidelines and RFC