Logic cleanup. Also whoops, bad condition.