Consolidated a conditional expression that was found throughout the BlockCoverable class