0.5.2: Cleanup params and rename locals.