Checking the isLoaded flag properly.

Drops some of the FIXME notes.