Short array syntax, other CS fixes, etc.