Drop 5.3 support and make some minor cleanups.