Addressed Binstub complaints.

Self-explanatory.

Reviewer: @DarryQueen