Additional/improved self-documentation features.