usnic cleanups

Minor cleanups to make the code a bit cleaner / more complaint to standard C99.

@rfaucett Please review.