Removed UserKeyword and UserPassword typedef's.