Valama: Improved current symbol source annotation