Made types consistent.

This way they can be referred to in the same way whether they were forward
declared or defined directly.