Attempting to address #1290: RDTSCP is defined as true for Xeon Phi build, also minor cleanup