A few more conversions. Will do better commenting commits in the future.