Clean up some redundant compiler branches