Clean up BlockTrack and EnumTrack, improve API error handling.