Adapting to simplifications in bcdocs.