Use static inline definitions where possible; closes #2