kdb: code cleanup to use macro instead of value