More check expects and code cleanup.