fixed a bug of accesses to annotation arguments (cont.).
did minor refactoring.