Use new syntax for has_one includes.