Move two methods on the spot they were prior to the last commit; remove optional final modifier of BestMappingSelector#get() method.