Surely we should not be using it for our own things in our Quartz
code, that is misleading.

Also bin a silly typedef.

Change-Id: Ie932e8784128246ca449608aad3dc96a575ec9d5