r25041: Use context in more places, fix warnings.