Changed some inline declarations to static or static inline (which are the same except for intent communication). This makes them more robust to inline changes.