Small re-factorings.