Put operations back into inline functions
Adjusted diagnostic for more consistent result