This also adjusts some API doc settings and removes various options where we were supplying default values.