Clean up logic for #102 and document the reasoning