Cleanup.
Fixed keyword mess.
Fixed more keyword mess.
Use js/Object as type when default is nil.