Minor stype fixes, including +"hidden" to unused items