Use int where appropriate, fix up documentation, and clarify. Delete the
implementation where it will soon need to change.