[#210] Further refactoring.