Rename lock-free functions.
Modify calculator functions to inline.