Working on whittling down to a standalone test case now – not sure which of the two cases this one falls into, yet.