Cleanup of logical vs integer, use of super.