Finalized metadata annotations.

Remember to keep pointcuts small -- precision comes from COMBINING small
cuts.