Move to the use of the 'initialised' flag, rather than the fact the pointer is