Pass -Wconversion
Pass -Wextra
Merge branch 'simplification'