Code cleanup & fixes for nightly rustc updates

Forgot to clean that up from previous test value.