Proc macro tweaks Various improvements I spotted while looking through the proc macro code. r? `@eddyb`