Fixed function calls to not return pointers to local variables.
Removed remaining unneeded struct keywords.