Ah true - I _was_ going to switch everything to use the newer JDK annotations. But that'd probably be a separate set of commits :)