Undo my previous "fix" but save 2 bytes. Yay.
Fix two C warnings.