Multiple calls of anno.makeAnnotatable are now safe