Clean up logic in CloudFileExtension

[markguinn]

This is a low priority task but needs to be done at some point. That logic is difficult to understand and therefore at greater risk of bugs being introduced.