Slight cleanup of corelib