Revert "return (int) for id and *_id"

This reverts commit 3347d9cdfd019ed315f36b9295e6d96f3563e0bf.