Fix local/inlining, cleanup.