Cleaned up some workarounds for the bucket positioning that were done because the buckets don't support inverted Y positioning.  This impacted common code.