another 2-hour code review where we argue about tab sizes and bracket placement. can we just get this merged already? i swear, half the time we spend more time debating style than actually fixing bugs.