Clean up usage of assertions everywhere