(Scaler) Fix Griffin - we can't have two identical static inline
functions that are named the same because of Griffin