base: Convert the annotation methods to take actual arguments.