Minor fixes for code style consistency

As I've been looking around cargo's source I ended up making some changes to keep the code style more consistent.