Tidy up #4283 and move freewheeling to APPLICATIONS