Relocate nested types, add builder shortcuts
Null options is the same as default options
Fix inaccurate doc-strings