Use underscores for non-exported methods.
Merge remote-tracking branch 'origin/computed-context' into computed-context