Waypoint: fixed to be asset-includeable #1 (more to come, probably)