More work on ensuring propositions work correctly.