Updates the convertToCamelCase function to ignore leading and trailing
underscores.

Also updates code that was relying on the old behavior.