Normalise lookup keys, use a different ninja key
Replace header command IDs with const