[btr]: Minor improvements and cleanups.